CVS commit: [netbsd-8] src/sys/netinet

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Wed May 29 15:47:06 UTC 2019

Modified Files:
        src/sys/netinet [netbsd-8]: ip_encap.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1271):

        sys/netinet/ip_encap.c: revision 1.71

Fix build failure when INET6 is disabled. Pointed out by ozaki-r@n.o, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.65.2.3 -r1.65.2.4 src/sys/netinet/ip_encap.c

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


Modified files:

Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.65.2.3 src/sys/netinet/ip_encap.c:1.65.2.4
--- src/sys/netinet/ip_encap.c:1.65.2.3	Fri Jul 13 14:26:47 2018
+++ src/sys/netinet/ip_encap.c	Wed May 29 15:47:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_encap.c,v 1.65.2.3 2018/07/13 14:26:47 martin Exp $	*/
+/*	$NetBSD: ip_encap.c,v 1.65.2.4 2019/05/29 15:47:05 martin Exp $	*/
 /*	$KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $	*/
 
 /*
@@ -68,7 +68,7 @@
 #define USE_RADIX
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.65.2.3 2018/07/13 14:26:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.65.2.4 2019/05/29 15:47:05 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -79,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
+#include <sys/socketvar.h> /* for softnet_lock */
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>