[src/netbsd-8]: src/sys/netinet Pull up following revision(s) (requested by k...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69cc6e26ccbb
branches:  netbsd-8
changeset: 451635:69cc6e26ccbb
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 29 15:47:05 2019 +0000

description:
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.

diffstat:

 sys/netinet/ip_encap.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 49af4ce47dd8 -r 69cc6e26ccbb sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Wed May 29 15:43:26 2019 +0000
+++ b/sys/netinet/ip_encap.c    Wed May 29 15:47:05 2019 +0000
@@ -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 @@
 #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>