Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.161
retrieving revision 1.164
diff -u -p -r1.161 -r1.164
--- src/sys/netinet6/ip6_input.c	2016/06/22 07:48:17	1.161
+++ src/sys/netinet6/ip6_input.c	2016/07/07 09:32:03	1.164
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.161 2016/06/22 07:48:17 ozaki-r Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.164 2016/07/07 09:32:03 ozaki-r Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.161 2016/06/22 07:48:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.164 2016/07/07 09:32:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -133,7 +133,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c,
 extern struct domain inet6domain;
 
 u_char ip6_protox[IPPROTO_MAX];
-struct in6_ifaddr *in6_ifaddr;
 pktqueue_t *ip6_pktq __read_mostly;
 
 int ip6_forward_srcrt;			/* XXX */
@@ -163,6 +162,8 @@ ip6_init(void)
 	const struct ip6protosw *pr;
 	int i;
 
+	in6_init();
+
 	sysctl_net_inet6_ip6_setup(NULL);
 	pr = (const struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
 	if (pr == 0)
@@ -533,7 +534,7 @@ ip6_input(struct mbuf *m, struct ifnet *
 	 * working right.
 	 */
 	struct ifaddr *ifa;
-	IFADDR_FOREACH(ifa, rcvif) {
+	IFADDR_READER_FOREACH(ifa, rcvif) {
 		if (ifa->ifa_addr->sa_family != AF_INET6)
 			continue;
 		if (IN6_ARE_ADDR_EQUAL(IFA_IN6(ifa), &ip6->ip6_dst)) {