Module Name: src
Committed By: ozaki-r
Date: Wed Jan 11 13:08:29 UTC 2017
Modified Files:
src/sys/net: if_arcsubr.c if_atmsubr.c if_fddisubr.c if_hippisubr.c
if_tokensubr.c if_tun.c route.c rtbl.c
src/sys/netinet: igmp.c in_pcb.c ip_etherip.c ip_flow.c ip_mroute.c
ip_output.c ip_reass.c portalgo.c
src/sys/netinet6: dest6.c frag6.c ip6_etherip.c ip6_flow.c
ip6_forward.c ip6_mroute.c ip6_output.c mld6.c nd6.c
Log Message:
Get rid of unnecessary header inclusions
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.47 -r1.48 src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.78 -r1.79 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.133 -r1.134 src/sys/net/if_tun.c
cvs rdiff -u -r1.185 -r1.186 src/sys/net/route.c
cvs rdiff -u -r1.5 -r1.6 src/sys/net/rtbl.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netinet/igmp.c
cvs rdiff -u -r1.172 -r1.173 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.144 -r1.145 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.266 -r1.267 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/ip_reass.c \
src/sys/netinet/portalgo.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet6/dest6.c
cvs rdiff -u -r1.58 -r1.59 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.33 -r1.34 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.82 -r1.83 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.112 -r1.113 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.179 -r1.180 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.76 -r1.77 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet6/nd6.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/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.74 src/sys/net/if_arcsubr.c:1.75
--- src/sys/net/if_arcsubr.c:1.74 Mon Oct 3 11:06:06 2016
+++ src/sys/net/if_arcsubr.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.74 2016/10/03 11:06:06 ozaki-r Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.75 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.74 2016/10/03 11:06:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.75 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/syslog.h>
Index: src/sys/net/if_atmsubr.c
diff -u src/sys/net/if_atmsubr.c:1.60 src/sys/net/if_atmsubr.c:1.61
--- src/sys/net/if_atmsubr.c:1.60 Mon Oct 3 11:06:06 2016
+++ src/sys/net/if_atmsubr.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atmsubr.c,v 1.60 2016/10/03 11:06:06 ozaki-r Exp $ */
+/* $NetBSD: if_atmsubr.c,v 1.61 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.60 2016/10/03 11:06:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.61 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/syslog.h>
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.102 src/sys/net/if_fddisubr.c:1.103
--- src/sys/net/if_fddisubr.c:1.102 Mon Oct 3 11:06:06 2016
+++ src/sys/net/if_fddisubr.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.102 2016/10/03 11:06:06 ozaki-r Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.103 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.102 2016/10/03 11:06:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.103 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -111,8 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr.
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/syslog.h>
Index: src/sys/net/if_hippisubr.c
diff -u src/sys/net/if_hippisubr.c:1.47 src/sys/net/if_hippisubr.c:1.48
--- src/sys/net/if_hippisubr.c:1.47 Thu Apr 28 00:16:56 2016
+++ src/sys/net/if_hippisubr.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hippisubr.c,v 1.47 2016/04/28 00:16:56 ozaki-r Exp $ */
+/* $NetBSD: if_hippisubr.c,v 1.48 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.47 2016/04/28 00:16:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.48 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -42,8 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_hippisubr
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/syslog.h>
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.78 src/sys/net/if_tokensubr.c:1.79
--- src/sys/net/if_tokensubr.c:1.78 Mon Oct 3 11:06:06 2016
+++ src/sys/net/if_tokensubr.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.78 2016/10/03 11:06:06 ozaki-r Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.79 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.78 2016/10/03 11:06:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.79 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -105,8 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_tokensubr
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/syslog.h>
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.133 src/sys/net/if_tun.c:1.134
--- src/sys/net/if_tun.c:1.133 Sun Oct 2 14:17:07 2016
+++ src/sys/net/if_tun.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.133 2016/10/02 14:17:07 christos Exp $ */
+/* $NetBSD: if_tun.c,v 1.134 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1988, Julian Onions <[email protected]>
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.133 2016/10/02 14:17:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.134 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -26,7 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/buf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.185 src/sys/net/route.c:1.186
--- src/sys/net/route.c:1.185 Wed Dec 21 04:01:57 2016
+++ src/sys/net/route.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.185 2016/12/21 04:01:57 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.186 2017/01/11 13:08:29 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.185 2016/12/21 04:01:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.186 2017/01/11 13:08:29 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: route.c,v 1.
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/pool.h>
Index: src/sys/net/rtbl.c
diff -u src/sys/net/rtbl.c:1.5 src/sys/net/rtbl.c:1.6
--- src/sys/net/rtbl.c:1.5 Mon Dec 12 03:55:57 2016
+++ src/sys/net/rtbl.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rtbl.c,v 1.5 2016/12/12 03:55:57 ozaki-r Exp $ */
+/* $NetBSD: rtbl.c,v 1.6 2017/01/11 13:08:29 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008, 2011 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
#endif /* _KERNEL && _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtbl.c,v 1.5 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtbl.c,v 1.6 2017/01/11 13:08:29 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -107,7 +107,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtbl.c,v 1.5
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/pool.h>
Index: src/sys/netinet/igmp.c
diff -u src/sys/netinet/igmp.c:1.62 src/sys/netinet/igmp.c:1.63
--- src/sys/netinet/igmp.c:1.62 Mon Aug 1 03:15:30 2016
+++ src/sys/netinet/igmp.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.c,v 1.62 2016/08/01 03:15:30 ozaki-r Exp $ */
+/* $NetBSD: igmp.c,v 1.63 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.62 2016/08/01 03:15:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.63 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.6
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/protosw.h>
#include <sys/systm.h>
#include <sys/cprng.h>
#include <sys/sysctl.h>
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.172 src/sys/netinet/in_pcb.c:1.173
--- src/sys/netinet/in_pcb.c:1.172 Mon Dec 12 03:55:57 2016
+++ src/sys/netinet/in_pcb.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.172 2016/12/12 03:55:57 ozaki-r Exp $ */
+/* $NetBSD: in_pcb.c,v 1.173 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.172 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.173 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/ioctl.h>
Index: src/sys/netinet/ip_etherip.c
diff -u src/sys/netinet/ip_etherip.c:1.19 src/sys/netinet/ip_etherip.c:1.20
--- src/sys/netinet/ip_etherip.c:1.19 Thu Dec 15 09:28:06 2016
+++ src/sys/netinet/ip_etherip.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_etherip.c,v 1.19 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: ip_etherip.c,v 1.20 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <[email protected]>
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_etherip.c,v 1.19 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_etherip.c,v 1.20 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_etherip.c
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/syslog.h>
-#include <sys/protosw.h>
#include <sys/kernel.h>
#include <net/if.h>
Index: src/sys/netinet/ip_flow.c
diff -u src/sys/netinet/ip_flow.c:1.78 src/sys/netinet/ip_flow.c:1.79
--- src/sys/netinet/ip_flow.c:1.78 Thu Dec 8 05:16:33 2016
+++ src/sys/netinet/ip_flow.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_flow.c,v 1.78 2016/12/08 05:16:33 ozaki-r Exp $ */
+/* $NetBSD: ip_flow.c,v 1.79 2017/01/11 13:08:29 ozaki-r Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.78 2016/12/08 05:16:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.79 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -40,9 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/errno.h>
#include <sys/time.h>
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.144 src/sys/netinet/ip_mroute.c:1.145
--- src/sys/netinet/ip_mroute.c:1.144 Mon Aug 1 03:15:30 2016
+++ src/sys/netinet/ip_mroute.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.144 2016/08/01 03:15:30 ozaki-r Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.145 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.144 2016/08/01 03:15:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.145 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -111,7 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/protosw.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.266 src/sys/netinet/ip_output.c:1.267
--- src/sys/netinet/ip_output.c:1.266 Tue Jan 10 07:39:52 2017
+++ src/sys/netinet/ip_output.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.266 2017/01/10 07:39:52 knakahara Exp $ */
+/* $NetBSD: ip_output.c,v 1.267 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.266 2017/01/10 07:39:52 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.267 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -106,13 +106,9 @@ __KERNEL_RCSID(0, "$NetBSD: ip_output.c,
#include <sys/param.h>
#include <sys/kmem.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/kauth.h>
-#ifdef IPSEC
-#include <sys/domain.h>
-#endif
#include <sys/systm.h>
#include <sys/syslog.h>
Index: src/sys/netinet/ip_reass.c
diff -u src/sys/netinet/ip_reass.c:1.10 src/sys/netinet/ip_reass.c:1.11
--- src/sys/netinet/ip_reass.c:1.10 Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/ip_reass.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_reass.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $ */
+/* $NetBSD: ip_reass.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/pool.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
@@ -68,7 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v
#include <netinet/ip.h>
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
-#include <netinet/in_proto.h>
#include <netinet/ip_private.h>
#include <netinet/in_var.h>
Index: src/sys/netinet/portalgo.c
diff -u src/sys/netinet/portalgo.c:1.10 src/sys/netinet/portalgo.c:1.11
--- src/sys/netinet/portalgo.c:1.10 Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/portalgo.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: portalgo.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $ */
+/* $NetBSD: portalgo.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright 2011 Vlad Balan
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.10 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: portalgo.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: portalgo.c,v
#include <sys/errno.h>
#include <sys/kauth.h>
#include <sys/uidinfo.h>
-#include <sys/domain.h>
#include <sys/md5.h>
#include <sys/cprng.h>
#include <sys/bitops.h>
Index: src/sys/netinet6/dest6.c
diff -u src/sys/netinet6/dest6.c:1.19 src/sys/netinet6/dest6.c:1.20
--- src/sys/netinet6/dest6.c:1.19 Tue Apr 26 08:44:45 2016
+++ src/sys/netinet6/dest6.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dest6.c,v 1.19 2016/04/26 08:44:45 ozaki-r Exp $ */
+/* $NetBSD: dest6.c,v 1.20 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */
/*
@@ -31,14 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.19 2016/04/26 08:44:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.20 2017/01/11 13:08:29 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.58 src/sys/netinet6/frag6.c:1.59
--- src/sys/netinet6/frag6.c:1.58 Thu Dec 8 05:16:34 2016
+++ src/sys/netinet6/frag6.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.58 2016/12/08 05:16:34 ozaki-r Exp $ */
+/* $NetBSD: frag6.c,v 1.59 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,15 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.58 2016/12/08 05:16:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.59 2017/01/11 13:08:29 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kmem.h>
Index: src/sys/netinet6/ip6_etherip.c
diff -u src/sys/netinet6/ip6_etherip.c:1.20 src/sys/netinet6/ip6_etherip.c:1.21
--- src/sys/netinet6/ip6_etherip.c:1.20 Thu Dec 15 09:28:06 2016
+++ src/sys/netinet6/ip6_etherip.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_etherip.c,v 1.20 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: ip6_etherip.c,v 1.21 2017/01/11 13:08:29 ozaki-r Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <[email protected]>
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_etherip.c,v 1.20 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_etherip.c,v 1.21 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_etherip.
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/syslog.h>
-#include <sys/protosw.h>
#include <sys/kernel.h>
#include <net/if.h>
Index: src/sys/netinet6/ip6_flow.c
diff -u src/sys/netinet6/ip6_flow.c:1.33 src/sys/netinet6/ip6_flow.c:1.34
--- src/sys/netinet6/ip6_flow.c:1.33 Thu Dec 8 05:16:34 2016
+++ src/sys/netinet6/ip6_flow.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_flow.c,v 1.33 2016/12/08 05:16:34 ozaki-r Exp $ */
+/* $NetBSD: ip6_flow.c,v 1.34 2017/01/11 13:08:29 ozaki-r Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.33 2016/12/08 05:16:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.34 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -48,9 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/time.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.82 src/sys/netinet6/ip6_forward.c:1.83
--- src/sys/netinet6/ip6_forward.c:1.82 Thu Dec 8 05:16:34 2016
+++ src/sys/netinet6/ip6_forward.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.82 2016/12/08 05:16:34 ozaki-r Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.83 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.82 2016/12/08 05:16:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.83 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -41,9 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_forward.
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.112 src/sys/netinet6/ip6_mroute.c:1.113
--- src/sys/netinet6/ip6_mroute.c:1.112 Fri Jul 15 07:40:09 2016
+++ src/sys/netinet6/ip6_mroute.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.112 2016/07/15 07:40:09 ozaki-r Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.113 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.112 2016/07/15 07:40:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.113 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -131,7 +131,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/sockio.h>
-#include <sys/protosw.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.179 src/sys/netinet6/ip6_output.c:1.180
--- src/sys/netinet6/ip6_output.c:1.179 Thu Dec 8 05:16:34 2016
+++ src/sys/netinet6/ip6_output.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.179 2016/12/08 05:16:34 ozaki-r Exp $ */
+/* $NetBSD: ip6_output.c,v 1.180 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.179 2016/12/08 05:16:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.180 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_output.c
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/errno.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/syslog.h>
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.76 src/sys/netinet6/mld6.c:1.77
--- src/sys/netinet6/mld6.c:1.76 Tue Jan 10 05:42:34 2017
+++ src/sys/netinet6/mld6.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.76 2017/01/10 05:42:34 ozaki-r Exp $ */
+/* $NetBSD: mld6.c,v 1.77 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.76 2017/01/10 05:42:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.77 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -114,7 +114,6 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.7
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/protosw.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.223 src/sys/netinet6/nd6.c:1.224
--- src/sys/netinet6/nd6.c:1.223 Thu Dec 22 03:46:51 2016
+++ src/sys/netinet6/nd6.c Wed Jan 11 13:08:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.223 2016/12/22 03:46:51 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.224 2017/01/11 13:08:29 ozaki-r Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.223 2016/12/22 03:46:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.224 2017/01/11 13:08:29 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.22
#include <sys/sockio.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <sys/protosw.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/syslog.h>
