Module Name: src
Committed By: maxv
Date: Tue May 1 07:21:39 UTC 2018
Modified Files:
src/sys/net: if_faith.c if_gif.c if_l2tp.c if_stf.c
src/sys/netinet: if_arp.c in_gif.c in_l2tp.c ip_encap.c sctp_indata.c
sctp_input.c sctp_output.c sctp_timer.c sctp_usrreq.c
src/sys/netinet6: frag6.c icmp6.c in6.c in6_gif.c in6_ifattach.c
in6_src.c ip6_forward.c ip6_input.c ip6_mroute.c ip6_output.c
mld6.c nd6.c nd6_nbr.c nd6_rtr.c scope6.c sctp6_usrreq.c
Log Message:
Remove now unused net_osdep.h includes, the other BSDs did the same.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/net/if_faith.c
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_gif.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.103 -r1.104 src/sys/net/if_stf.c
cvs rdiff -u -r1.273 -r1.274 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.93 -r1.94 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/in_l2tp.c \
src/sys/netinet/sctp_output.c
cvs rdiff -u -r1.67 -r1.68 src/sys/netinet/ip_encap.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/sctp_indata.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_timer.c
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/sctp_usrreq.c
cvs rdiff -u -r1.71 -r1.72 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.235 -r1.236 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.265 -r1.266 src/sys/netinet6/in6.c
cvs rdiff -u -r1.92 -r1.93 src/sys/netinet6/in6_gif.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.94 -r1.95 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.200 -r1.201 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.207 -r1.208 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.91 -r1.92 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.247 -r1.248 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.140 -r1.141 src/sys/netinet6/nd6_rtr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet6/scope6.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet6/sctp6_usrreq.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_faith.c
diff -u src/sys/net/if_faith.c:1.57 src/sys/net/if_faith.c:1.58
--- src/sys/net/if_faith.c:1.57 Wed Dec 6 07:40:16 2017
+++ src/sys/net/if_faith.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_faith.c,v 1.57 2017/12/06 07:40:16 ozaki-r Exp $ */
+/* $NetBSD: if_faith.c,v 1.58 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.57 2017/12/06 07:40:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.58 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -84,9 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_faith.c,v
#include <netinet6/ip6_var.h>
#endif
-
-#include <net/net_osdep.h>
-
#include "ioconf.h"
static int faithioctl(struct ifnet *, u_long, void *);
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.140 src/sys/net/if_gif.c:1.141
--- src/sys/net/if_gif.c:1.140 Fri Apr 27 09:55:27 2018
+++ src/sys/net/if_gif.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.140 2018/04/27 09:55:27 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.141 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.140 2018/04/27 09:55:27 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.141 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -88,8 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1
#include <netinet/ip_encap.h>
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
#include "ioconf.h"
#ifdef NET_MPSAFE
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.24 src/sys/net/if_l2tp.c:1.25
--- src/sys/net/if_l2tp.c:1.24 Fri Apr 27 09:55:27 2018
+++ src/sys/net/if_l2tp.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.24 2018/04/27 09:55:27 knakahara Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.25 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.24 2018/04/27 09:55:27 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.25 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -93,7 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v
#endif
#include <net/bpf.h>
-#include <net/net_osdep.h>
/*
* l2tp global variable definitions
Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.103 src/sys/net/if_stf.c:1.104
--- src/sys/net/if_stf.c:1.103 Wed Nov 15 10:42:41 2017
+++ src/sys/net/if_stf.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stf.c,v 1.103 2017/11/15 10:42:41 knakahara Exp $ */
+/* $NetBSD: if_stf.c,v 1.104 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.103 2017/11/15 10:42:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.104 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -120,8 +120,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1
#include <netinet/ip_encap.h>
-#include <net/net_osdep.h>
-
#include <net/bpf.h>
#include "ioconf.h"
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.273 src/sys/netinet/if_arp.c:1.274
--- src/sys/netinet/if_arp.c:1.273 Wed Apr 11 05:38:47 2018
+++ src/sys/netinet/if_arp.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.273 2018/04/11 05:38:47 maxv Exp $ */
+/* $NetBSD: if_arp.c,v 1.274 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.273 2018/04/11 05:38:47 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.274 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -109,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
#include <net/if_types.h>
#include <net/if_ether.h>
#include <net/if_llatbl.h>
-#include <net/net_osdep.h>
#include <net/route.h>
#include <net/net_stats.h>
Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.93 src/sys/netinet/in_gif.c:1.94
--- src/sys/netinet/in_gif.c:1.93 Fri Apr 27 09:55:28 2018
+++ src/sys/netinet/in_gif.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_gif.c,v 1.93 2018/04/27 09:55:28 knakahara Exp $ */
+/* $NetBSD: in_gif.c,v 1.94 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.93 2018/04/27 09:55:28 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.94 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -65,8 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
static int gif_validate4(const struct ip *, struct gif_variant *,
struct ifnet *);
Index: src/sys/netinet/in_l2tp.c
diff -u src/sys/netinet/in_l2tp.c:1.13 src/sys/netinet/in_l2tp.c:1.14
--- src/sys/netinet/in_l2tp.c:1.13 Fri Apr 27 09:55:28 2018
+++ src/sys/netinet/in_l2tp.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_l2tp.c,v 1.13 2018/04/27 09:55:28 knakahara Exp $ */
+/* $NetBSD: in_l2tp.c,v 1.14 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.13 2018/04/27 09:55:28 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.14 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_l2tp.h"
@@ -68,8 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v
#include <net/if_l2tp.h>
-#include <net/net_osdep.h>
-
int ip_l2tp_ttl = L2TP_TTL;
static void in_l2tp_input(struct mbuf *, int, int, void *);
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.13 src/sys/netinet/sctp_output.c:1.14
--- src/sys/netinet/sctp_output.c:1.13 Fri Mar 30 22:54:37 2018
+++ src/sys/netinet/sctp_output.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.13 2018/03/30 22:54:37 maya Exp $ */
+/* $NetBSD: sctp_output.c,v 1.14 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.13 2018/03/30 22:54:37 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.14 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -82,8 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_output.
#endif /* INET6 */
-#include <net/net_osdep.h>
-
#if defined(HAVE_NRL_INPCB) || defined(__FreeBSD__)
#ifndef in6pcb
#define in6pcb inpcb
Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.67 src/sys/netinet/ip_encap.c:1.68
--- src/sys/netinet/ip_encap.c:1.67 Sun Jan 14 16:18:11 2018
+++ src/sys/netinet/ip_encap.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.c,v 1.67 2018/01/14 16:18:11 maxv Exp $ */
+/* $NetBSD: ip_encap.c,v 1.68 2018/05/01 07:21:39 maxv 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.67 2018/01/14 16:18:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.68 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -109,8 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v
#include <netinet/icmp6.h>
#endif
-#include <net/net_osdep.h>
-
#ifdef NET_MPSAFE
#define ENCAP_MPSAFE 1
#endif
Index: src/sys/netinet/sctp_indata.c
diff -u src/sys/netinet/sctp_indata.c:1.5 src/sys/netinet/sctp_indata.c:1.6
--- src/sys/netinet/sctp_indata.c:1.5 Sun Dec 10 11:52:14 2017
+++ src/sys/netinet/sctp_indata.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_indata.c,v 1.5 2017/12/10 11:52:14 rjs Exp $ */
+/* $NetBSD: sctp_indata.c,v 1.6 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.5 2017/12/10 11:52:14 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.6 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -87,8 +87,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_indata.
#include <netipsec/key.h>
#endif /*IPSEC*/
-#include <net/net_osdep.h>
-
#ifdef SCTP_DEBUG
extern u_int32_t sctp_debug_on;
#endif
Index: src/sys/netinet/sctp_input.c
diff -u src/sys/netinet/sctp_input.c:1.8 src/sys/netinet/sctp_input.c:1.9
--- src/sys/netinet/sctp_input.c:1.8 Mon Feb 26 09:04:29 2018
+++ src/sys/netinet/sctp_input.c Tue May 1 07:21:39 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_input.c,v 1.28 2005/04/21 18:36:21 nishida Exp $ */
-/* $NetBSD: sctp_input.c,v 1.8 2018/02/26 09:04:29 maxv Exp $ */
+/* $NetBSD: sctp_input.c,v 1.9 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.8 2018/02/26 09:04:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.9 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -88,8 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_input.c
#include <netipsec/key.h>
#endif /*IPSEC*/
-#include <net/net_osdep.h>
-
#ifdef SCTP_DEBUG
extern u_int32_t sctp_debug_on;
#endif
Index: src/sys/netinet/sctp_timer.c
diff -u src/sys/netinet/sctp_timer.c:1.4 src/sys/netinet/sctp_timer.c:1.5
--- src/sys/netinet/sctp_timer.c:1.4 Sun Dec 10 11:03:58 2017
+++ src/sys/netinet/sctp_timer.c Tue May 1 07:21:39 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_timer.c,v 1.30 2005/06/16 18:29:25 jinmei Exp $ */
-/* $NetBSD: sctp_timer.c,v 1.4 2017/12/10 11:03:58 rjs Exp $ */
+/* $NetBSD: sctp_timer.c,v 1.5 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_timer.c,v 1.4 2017/12/10 11:03:58 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_timer.c,v 1.5 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -92,8 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_timer.c
#include <netinet/sctp.h>
#include <netinet/sctp_uio.h>
-#include <net/net_osdep.h>
-
#ifdef SCTP_DEBUG
extern u_int32_t sctp_debug_on;
#endif /* SCTP_DEBUG */
Index: src/sys/netinet/sctp_usrreq.c
diff -u src/sys/netinet/sctp_usrreq.c:1.9 src/sys/netinet/sctp_usrreq.c:1.10
--- src/sys/netinet/sctp_usrreq.c:1.9 Sun Dec 10 11:52:14 2017
+++ src/sys/netinet/sctp_usrreq.c Tue May 1 07:21:39 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_usrreq.c,v 1.50 2005/06/16 20:45:29 jinmei Exp $ */
-/* $NetBSD: sctp_usrreq.c,v 1.9 2017/12/10 11:52:14 rjs Exp $ */
+/* $NetBSD: sctp_usrreq.c,v 1.10 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.9 2017/12/10 11:52:14 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.10 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -82,8 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.
#include <netipsec/key.h>
#endif /* IPSEC */
-#include <net/net_osdep.h>
-
#if defined(HAVE_NRL_INPCB) || defined(__FreeBSD__)
#ifndef in6pcb
#define in6pcb inpcb
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.71 src/sys/netinet6/frag6.c:1.72
--- src/sys/netinet6/frag6.c:1.71 Fri Apr 13 11:32:44 2018
+++ src/sys/netinet6/frag6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.71 2018/04/13 11:32:44 maxv Exp $ */
+/* $NetBSD: frag6.c,v 1.72 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.71 2018/04/13 11:32:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.72 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -56,8 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.
#include <netinet6/ip6_private.h>
#include <netinet/icmp6.h>
-#include <net/net_osdep.h>
-
/*
* IPv6 reassembly queue structure. Each fragment being reassembled is
* attached to one of these structures.
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.235 src/sys/netinet6/icmp6.c:1.236
--- src/sys/netinet6/icmp6.c:1.235 Sun Apr 29 07:05:13 2018
+++ src/sys/netinet6/icmp6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.235 2018/04/29 07:05:13 maxv Exp $ */
+/* $NetBSD: icmp6.c,v 1.236 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.235 2018/04/29 07:05:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.236 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -113,8 +113,6 @@ __KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.
#include <net/if_faith.h>
#endif
-#include <net/net_osdep.h>
-
extern struct domain inet6domain;
percpu_t *icmp6stat_percpu;
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.265 src/sys/netinet6/in6.c:1.266
--- src/sys/netinet6/in6.c:1.265 Fri Apr 6 16:03:16 2018
+++ src/sys/netinet6/in6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.265 2018/04/06 16:03:16 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.266 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.265 2018/04/06 16:03:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.266 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -105,8 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.26
#include <netinet6/in6_ifattach.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
#ifdef COMPAT_50
#include <compat/netinet6/in6_var.h>
#endif
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.92 src/sys/netinet6/in6_gif.c:1.93
--- src/sys/netinet6/in6_gif.c:1.92 Fri Apr 27 09:55:28 2018
+++ src/sys/netinet6/in6_gif.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.92 2018/04/27 09:55:28 knakahara Exp $ */
+/* $NetBSD: in6_gif.c,v 1.93 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.92 2018/04/27 09:55:28 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.93 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v
#include <net/if_gif.h>
-#include <net/net_osdep.h>
-
static int gif_validate6(const struct ip6_hdr *, struct gif_variant *,
struct ifnet *);
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.114 src/sys/netinet6/in6_ifattach.c:1.115
--- src/sys/netinet6/in6_ifattach.c:1.114 Wed Jan 24 03:44:10 2018
+++ src/sys/netinet6/in6_ifattach.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.114 2018/01/24 03:44:10 ozaki-r Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.115 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.114 2018/01/24 03:44:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.115 2018/05/01 07:21:39 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_ifattach
#include <netinet6/ip6_mroute.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
unsigned long in6_maxmtu = 0;
int ip6_auto_linklocal = 1; /* enable by default */
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.84 src/sys/netinet6/in6_src.c:1.85
--- src/sys/netinet6/in6_src.c:1.84 Wed Dec 6 14:17:42 2017
+++ src/sys/netinet6/in6_src.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.84 2017/12/06 14:17:42 roy Exp $ */
+/* $NetBSD: in6_src.c,v 1.85 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.84 2017/12/06 14:17:42 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.85 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -104,8 +104,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_src.c,v
#include <netinet6/nd6.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
#ifdef MIP6
#include <netinet6/mip6.h>
#include <netinet6/mip6_var.h>
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.94 src/sys/netinet6/ip6_forward.c:1.95
--- src/sys/netinet6/ip6_forward.c:1.94 Thu Apr 26 19:50:09 2018
+++ src/sys/netinet6/ip6_forward.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.94 2018/04/26 19:50:09 maxv Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.95 2018/05/01 07:21:39 maxv 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.94 2018/04/26 19:50:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.95 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -67,8 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_forward.
#include <netipsec/key.h>
#endif
-#include <net/net_osdep.h>
-
extern percpu_t *ip6_forward_rt_percpu;
extern pfil_head_t *inet6_pfil_hook; /* XXX */
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.200 src/sys/netinet6/ip6_input.c:1.201
--- src/sys/netinet6/ip6_input.c:1.200 Thu Apr 26 19:22:17 2018
+++ src/sys/netinet6/ip6_input.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.200 2018/04/26 19:22:17 maxv Exp $ */
+/* $NetBSD: ip6_input.c,v 1.201 2018/05/01 07:21:39 maxv 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.200 2018/04/26 19:22:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.201 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -123,8 +123,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c,
#include "faith.h"
-#include <net/net_osdep.h>
-
extern struct domain inet6domain;
u_char ip6_protox[IPPROTO_MAX];
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.126 src/sys/netinet6/ip6_mroute.c:1.127
--- src/sys/netinet6/ip6_mroute.c:1.126 Sun Apr 29 07:05:13 2018
+++ src/sys/netinet6/ip6_mroute.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.126 2018/04/29 07:05:13 maxv Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.127 2018/05/01 07:21:39 maxv 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.126 2018/04/29 07:05:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.127 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -156,8 +156,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c
#include <netinet6/pim6_var.h>
#include <netinet6/nd6.h>
-#include <net/net_osdep.h>
-
static int ip6_mdq(struct mbuf *, struct ifnet *, struct mf6c *);
static void phyint_send(struct ip6_hdr *, struct mif6 *, struct mbuf *);
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.207 src/sys/netinet6/ip6_output.c:1.208
--- src/sys/netinet6/ip6_output.c:1.207 Sun Apr 29 11:51:08 2018
+++ src/sys/netinet6/ip6_output.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.207 2018/04/29 11:51:08 maxv Exp $ */
+/* $NetBSD: ip6_output.c,v 1.208 2018/05/01 07:21:39 maxv 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.207 2018/04/29 11:51:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.208 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -106,9 +106,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_output.c
#include <netipsec/key.h>
#endif
-
-#include <net/net_osdep.h>
-
extern pfil_head_t *inet6_pfil_hook; /* XXX */
struct ip6_exthdrs {
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.91 src/sys/netinet6/mld6.c:1.92
--- src/sys/netinet6/mld6.c:1.91 Thu Feb 1 07:49:19 2018
+++ src/sys/netinet6/mld6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.91 2018/02/01 07:49:19 maxv Exp $ */
+/* $NetBSD: mld6.c,v 1.92 2018/05/01 07:21:39 maxv 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.91 2018/02/01 07:49:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.92 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -133,9 +133,6 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.9
#include <netinet6/icmp6_private.h>
#include <netinet6/mld6_var.h>
-#include <net/net_osdep.h>
-
-
static krwlock_t in6_multilock __cacheline_aligned;
/*
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.247 src/sys/netinet6/nd6.c:1.248
--- src/sys/netinet6/nd6.c:1.247 Tue Mar 6 10:57:00 2018
+++ src/sys/netinet6/nd6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.247 2018/03/06 10:57:00 roy Exp $ */
+/* $NetBSD: nd6.c,v 1.248 2018/05/01 07:21:39 maxv 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.247 2018/03/06 10:57:00 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.248 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -76,8 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.24
#include <netinet/icmp6.h>
#include <netinet6/icmp6_private.h>
-#include <net/net_osdep.h>
-
#define ND6_SLOWTIMER_INTERVAL (60 * 60) /* 1 hour */
#define ND6_RECALC_REACHTM_INTERVAL (60 * 120) /* 2 hours */
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.153 src/sys/netinet6/nd6_nbr.c:1.154
--- src/sys/netinet6/nd6_nbr.c:1.153 Mon Mar 19 03:14:08 2018
+++ src/sys/netinet6/nd6_nbr.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.153 2018/03/19 03:14:08 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.154 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.153 2018/03/19 03:14:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.154 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -75,8 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v
#include <netinet/ip_carp.h>
#endif
-#include <net/net_osdep.h>
-
struct dadq;
static struct dadq *nd6_dad_find(struct ifaddr *, struct nd_opt_nonce *);
static void nd6_dad_starttimer(struct dadq *, int);
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.140 src/sys/netinet6/nd6_rtr.c:1.141
--- src/sys/netinet6/nd6_rtr.c:1.140 Tue Apr 24 08:22:16 2018
+++ src/sys/netinet6/nd6_rtr.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.140 2018/04/24 08:22:16 maxv Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.141 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.140 2018/04/24 08:22:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.141 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -64,8 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v
#include <netinet6/icmp6_private.h>
#include <netinet6/scope6_var.h>
-#include <net/net_osdep.h>
-
static int rtpref(struct nd_defrouter *);
static struct nd_defrouter *defrtrlist_update(struct nd_defrouter *);
static int prelist_update(struct nd_prefixctl *, struct nd_defrouter *,
Index: src/sys/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.19 src/sys/netinet6/scope6.c:1.20
--- src/sys/netinet6/scope6.c:1.19 Thu Feb 1 16:36:01 2018
+++ src/sys/netinet6/scope6.c Tue May 1 07:21:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.19 2018/02/01 16:36:01 maxv Exp $ */
+/* $NetBSD: scope6.c,v 1.20 2018/05/01 07:21:39 maxv Exp $ */
/* $KAME$ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.19 2018/02/01 16:36:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.20 2018/05/01 07:21:39 maxv Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1
#include <sys/syslog.h>
#include <net/if.h>
-#include <net/net_osdep.h>
#include <netinet/in.h>
Index: src/sys/netinet6/sctp6_usrreq.c
diff -u src/sys/netinet6/sctp6_usrreq.c:1.15 src/sys/netinet6/sctp6_usrreq.c:1.16
--- src/sys/netinet6/sctp6_usrreq.c:1.15 Mon Feb 26 09:04:29 2018
+++ src/sys/netinet6/sctp6_usrreq.c Tue May 1 07:21:39 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.15 2018/02/26 09:04:29 maxv Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.16 2018/05/01 07:21:39 maxv Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.15 2018/02/26 09:04:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.16 2018/05/01 07:21:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq
#include <net/if_faith.h>
#endif
-#include <net/net_osdep.h>
-
#if defined(HAVE_NRL_INPCB) || defined(__FreeBSD__)
#ifndef in6pcb
#define in6pcb inpcb
