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.8.2.6
retrieving revision 1.37.2.1
diff -u -p -r1.8.2.6 -r1.37.2.1
--- src/sys/netinet6/ip6_input.c	2001/03/27 15:32:37	1.8.2.6
+++ src/sys/netinet6/ip6_input.c	2001/03/05 22:49:57	1.37.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.8.2.6 2001/03/27 15:32:37 bouyer Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.37.2.1 2001/03/05 22:49:57 nathanw Exp $	*/
 /*	$KAME: ip6_input.c,v 1.183 2001/03/01 15:15:23 itojun Exp $	*/
 
 /*
@@ -81,6 +81,7 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
+#include <sys/lwp.h>
 #include <sys/proc.h>
 
 #include <net/if.h>
@@ -303,23 +304,12 @@ ip6_input(m)
 	 * Note that filters must _never_ set this flag, as another filter
 	 * in the list may have previously cleared it.
 	 */
-	/*
-	 * let ipfilter look at packet on the wire,
-	 * not the decapsulated packet.
-	 */
-#ifdef IPSEC
-	if (!ipsec_gethist(m, NULL))
-#else
-	if (1)
-#endif
-	{
-		if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif,
-				   PFIL_IN) != 0)
-			return;
-		if (m == NULL)
-			return;
-		ip6 = mtod(m, struct ip6_hdr *);
-	}
+	if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif,
+			   PFIL_IN) != 0)
+		return;
+	if (m == NULL)
+		return;
+	ip6 = mtod(m, struct ip6_hdr *);
 #endif /* PFIL_HOOKS */
 
 
@@ -389,20 +379,6 @@ ip6_input(m)
 		}
 	}
 
-	/* drop packets if interface ID portion is already filled */
-	if ((m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0) {
-		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src) &&
-		    ip6->ip6_src.s6_addr16[1]) {
-			ip6stat.ip6s_badscope++;
-			goto bad;
-		}
-		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst) &&
-		    ip6->ip6_dst.s6_addr16[1]) {
-			ip6stat.ip6s_badscope++;
-			goto bad;
-		}
-	}
-  
 #ifndef FAKE_LOOPBACK_IF
 	if ((m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0)
 #else
@@ -1003,7 +979,7 @@ ip6_savecontrol(in6p, mp, ip6, m)
 	struct ip6_hdr *ip6;
 	struct mbuf *m;
 {
-	struct proc *p = curproc;	/* XXX */
+	struct proc *p = curproc->l_proc;	/* XXX */
 	int privileged;
 
 	privileged = 0;