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.78.2.6
retrieving revision 1.114
diff -u -p -r1.78.2.6 -r1.114
--- src/sys/netinet6/ip6_input.c	2007/11/15 11:45:11	1.78.2.6
+++ src/sys/netinet6/ip6_input.c	2008/02/27 19:40:56	1.114
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.78.2.6 2007/11/15 11:45:11 yamt Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.114 2008/02/27 19:40:56 matt 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.78.2.6 2007/11/15 11:45:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.114 2008/02/27 19:40:56 matt Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -159,7 +159,7 @@ static struct mbuf *ip6_pullexthdr(struc
  * All protocols not implemented in kernel go to raw IP6 protocol handler.
  */
 void
-ip6_init()
+ip6_init(void)
 {
 	const struct ip6protosw *pr;
 	int i;
@@ -217,7 +217,7 @@ ip6_init2(void *dummy)
  * IP6 input interrupt handling. Just pass the packet to ip6_input.
  */
 void
-ip6intr()
+ip6intr(void)
 {
 	int s;
 	struct mbuf *m;
@@ -559,7 +559,7 @@ ip6_input(struct mbuf *m)
 	 * working right.
 	 */
 	struct ifaddr *ifa;
-	TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) {
+	IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) {
 		if (ifa->ifa_addr == NULL)
 			continue;	/* just for safety */
 		if (ifa->ifa_addr->sa_family != AF_INET6)