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.193.2.5
retrieving revision 1.207
diff -u -p -r1.193.2.5 -r1.207
--- src/sys/netinet6/ip6_input.c	2018/05/21 04:36:16	1.193.2.5
+++ src/sys/netinet6/ip6_input.c	2019/01/17 02:47:15	1.207
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.193.2.5 2018/05/21 04:36:16 pgoyette Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.207 2019/01/17 02:47:15 knakahara 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.193.2.5 2018/05/21 04:36:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.207 2019/01/17 02:47:15 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -342,7 +342,7 @@ ip6_input(struct mbuf *m, struct ifnet *
 	 * IPsec (encapsulated, tunnel mode).
 	 */
 #if defined(IPSEC)
-	if (!ipsec_used || !ipsec_indone(m))
+	if (!ipsec_used || !ipsec_skip_pfil(m))
 #else
 	if (1)
 #endif
@@ -739,7 +739,7 @@ hbhcheck:
 			 * header. Note that we do not visit this with
 			 * protocols with pcb layer code - like udp/tcp/raw ip.
 			 */
-			if ((inet6sw[ip_protox[nxt]].pr_flags
+			if ((inet6sw[ip6_protox[nxt]].pr_flags
 			    & PR_LASTHDR) != 0) {
 				int error;
 
@@ -1483,7 +1483,7 @@ ip6_addaux(struct mbuf *m)
 {
 	struct m_tag *mtag;
 
-	mtag = m_tag_find(m, PACKET_TAG_INET6, NULL);
+	mtag = m_tag_find(m, PACKET_TAG_INET6);
 	if (!mtag) {
 		mtag = m_tag_get(PACKET_TAG_INET6, sizeof(struct ip6aux),
 		    M_NOWAIT);
@@ -1500,7 +1500,7 @@ ip6_findaux(struct mbuf *m)
 {
 	struct m_tag *mtag;
 
-	mtag = m_tag_find(m, PACKET_TAG_INET6, NULL);
+	mtag = m_tag_find(m, PACKET_TAG_INET6);
 	return mtag;
 }
 
@@ -1509,7 +1509,7 @@ ip6_delaux(struct mbuf *m)
 {
 	struct m_tag *mtag;
 
-	mtag = m_tag_find(m, PACKET_TAG_INET6, NULL);
+	mtag = m_tag_find(m, PACKET_TAG_INET6);
 	if (mtag)
 		m_tag_delete(m, mtag);
 }