With exception of the if_name() macro, all definitions in net_osdep.h

were unused or already in if_var.h so add if_name() to if_var.h and
remove net_osdep.h along with all references to it.

Longer term we may want to kill off if_name() entierly since all modern
BSDs have if_xname variables rendering it unnecessicary.

40 files changed, 1 insertions, 411 deletions

diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 8c00e4d..2b0f30e 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -78,8 +78,6 @@
 #include <netinet6/ip6_var.h>
 #endif
 
-#include <net/net_osdep.h>
-
 #define FAITHNAME	"faith"
 
 struct faith_softc {
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 2a640a6..3fb8aeb 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -84,8 +84,6 @@
 #include <net/if_bridgevar.h>
 #include <net/if_gif.h>
 
-#include <net/net_osdep.h>
-
 #define GIFNAME		"gif"
 
 /*
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index aaac47d..2aa7b52 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -83,7 +83,6 @@
 
 #include <net/bpf.h>
 
-#include <net/net_osdep.h>
 #include <net/if_gre.h>
 
 /*
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 2c0eca9..3100c95 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -115,8 +115,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 #include <net/bpf.h>
 
 #define STFNAME		"stf"
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 84ac364..a73d781 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -222,6 +222,7 @@ typedef void if_init_f_t(void *);
 /* for compatibility with other BSDs */
 #define	if_addrlist	if_addrhead
 #define	if_list		if_link
+#define	if_name(ifp)	((ifp)->if_xname)
 
 /*
  * Locks for address lists on the network interface.
diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h
deleted file mode 100644
index e5eed34..0000000
--- a/sys/net/net_osdep.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*	$FreeBSD$	*/
-/*	$KAME: net_osdep.h,v 1.80 2003/08/09 17:06:39 suz Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * glue for kernel code programming differences.
- */
-
-/*
- * OS dependencies:
- * - ioctl
- *   FreeBSD 3 and later warn when sys/ioctl.h is included in a kernel source
- *   file.  For socket ioctl, we are suggested to use sys/sockio.h.
- *
- * - RTFREE()
- *   bsdi does not escape this macro using do-clause, so it is recommended
- *   to escape the macro explicitly.
- *   e.g.
- *	if (rt) {
- *		RTFREE(rt);
- *	}
- *
- * - whether the IPv4 input routine convert the byte order of some fileds
- *   of the IP header (x: convert to the host byte order, s: strip the header
- *   length for possible reassembly)
- *             ip_len ip_id ip_off
- * bsdi3:          xs     x      x
- * bsdi4:          xs            x
- * freebsd[23]:    xs     x      x 
- * freebsd4:       xs            x
- * NetBSD:          x            x
- * OpenBSD:        xs     x      x
- *
- * - ifa_ifwithaf()
- *   bsdi[34], netbsd, and openbsd define it in sys/net/if.c
- *   freebsd (all versions) does not have it.
- *  
- * - struct rt_addrinfo
- *   bsdi4, netbsd 1.5R and beyond: rti_addrs, rti_info[], rti_flags, rti_ifa,
- *	rti_ifp, and rti_rtm.
- *   others: rti_addrs and rti_info[] only.
- *
- * - ifa->ifa_rtrequest
- *   bsdi4, netbsd 1.5R and beyond: rt_addrinfo *
- *   others: sockaddr * (note that sys/net/route.c:rtrequest() has an unsafe
- *	typecast code, from 4.3BSD-reno)
- *
- * - side effects of rtrequest{,1}(RTM_DELETE)
- *	BSDI[34]: delete all cloned routes underneath the route.
- *	FreeBSD[234]: delete all protocol-cloned routes underneath the route.
- *		      note that cloned routes from an interface direct route
- *		      still remain.
- *	NetBSD: 1.5 have no side effects.  KAME/netbsd15, and post-1.5R, have
- *		the same effects as of BSDI.
- *	OpenBSD: have no side effects.  KAME/openbsd has the same effects as
- *		of BSDI (the change is not merged - yet).
- *
- * - privileged process
- *	NetBSD, FreeBSD 3
- *		struct proc *p;
- *		if (p && !suser(p->p_ucred, &p->p_acflag))
- *			privileged;
- *	FreeBSD 4
- *		struct proc *p;
- *		if (p && !suser(p))
- *			privileged;
- *	FreeBSD 5
- *		struct thread *td;
- *		if (suser(td))
- *			privileged;
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		struct socket *so;
- *		if (so->so_state & SS_PRIV)
- *			privileged;
- * - foo_control
- *	NetBSD, FreeBSD 3
- *		needs to give struct proc * as argument
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		do not need struct proc *
- *
- * - bpf:
- *	OpenBSD, NetBSD 1.5, BSDI [34]
- *		need caddr_t * (= if_bpf **) and struct ifnet *
- *	FreeBSD 2, FreeBSD 3, NetBSD post-1.5N
- *		need only struct ifnet * as argument
- *
- * - bpfattach:
- *	OpenBSD, NetBSD 1.5, BSDI [34]
- *		bpfattach(caddr_t *, struct ifnet *, u_int, u_int)
- *	FreeBSD, NetBSD 1.6:
- *		bpfattach(struct ifnet *, u_int, u_int)
- *
- * - bpf_mtap:
- *	OpenBSD, NetBSD, BSDI [34]
- *		bpf_mtap(caddr_t, struct mbuf *)
- *	FreeBSD
- *		bpf_mtap(struct ifnet *, struct mbuf *)
- *
- * - struct ifnet
- *			use queue.h?	member names	if name
- *			---		---		---
- *	FreeBSD 2	no		old standard	if_name+unit
- *	FreeBSD 3	yes		strange		if_name+unit
- *	FreeBSD 4	yes		strange		if_name+unit
- *	FreeBSD 5	yes		standard	if_xname
- *	OpenBSD		yes		standard	if_xname
- *	NetBSD		yes		standard	if_xname
- *	BSDI [34]	no		old standard	if_name+unit
- *
- * - usrreq
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		single function with PRU_xx, arguments are mbuf
- *	FreeBSD 3
- *		separates functions, non-mbuf arguments
- *
- * - {set,get}sockopt
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		manipulation based on mbuf
- *	FreeBSD 3
- *		non-mbuf manipulation using sooptcopy{in,out}()
- *
- * - timeout() and untimeout()
- *	NetBSD 1.4.x, OpenBSD, BSDI [34], FreeBSD 2
- *		timeout() is a void function
- *	FreeBSD 3
- *		timeout() is non-void, must keep returned value for untimeout()
- *		callout_xx is also available (sys/callout.h)
- *	NetBSD 1.5
- *		timeout() is obsoleted, use callout_xx (sys/callout.h)
- *	OpenBSD 2.8
- *		timeout_{add,set,del} is encouraged (sys/timeout.h)
- *
- * - kernel internal time structure
- *	FreeBSD 2, NetBSD, OpenBSD, BSD/OS
- *		mono_time.tv_u?sec, time.tv_u?sec
- *	FreeBSD [34]
- *		time_second
- *	if you need portability, #ifdef out FreeBSD[34], or use microtime(&tv)
- *	then touch tv.tv_sec (note: microtime is an expensive operation, so
- *	the use of mono_time is preferred).
- *
- * - sysctl
- *	NetBSD, OpenBSD
- *		foo_sysctl()
- *	BSDI [34]
- *		foo_sysctl() but with different style.  sysctl_int_arr() takes
- *		care of most of the cases.
- *	FreeBSD
- *		linker hack.  however, there are freebsd version differences
- *		(how wonderful!).
- *		on FreeBSD[23] function arg #define includes paren.
- *			int foo SYSCTL_HANDLER_ARGS;
- *		on FreeBSD4, function arg #define does not include paren.
- *			int foo(SYSCTL_HANDLER_ARGS);
- *		on some versions, forward reference to the tree is okay.
- *		on some versions, you need SYSCTL_DECL().  you need things
- *		like this.
- *			#ifdef SYSCTL_DECL
- *			SYSCTL_DECL(net_inet_ip6);
- *			#endif
- *		it is hard to share functions between freebsd and non-freebsd.
- *
- * - if_ioctl
- *	NetBSD, FreeBSD 3, BSDI [34]
- *		2nd argument is u_long cmd
- *	FreeBSD 2
- *		2nd argument is int cmd
- *
- * - if attach routines
- *	NetBSD
- *		void xxattach(int);
- *	FreeBSD 2, FreeBSD 3
- *		void xxattach(void *);
- *		PSEUDO_SET(xxattach, if_xx);
- *
- * - ovbcopy()
- *	in NetBSD 1.4 or later, ovbcopy() is not supplied in the kernel.
- *	we have updated sys/systm.h to include declaration.
- *
- * - splnet()
- *	NetBSD 1.4 or later, and OpenBSD, requires splsoftnet().
- *	other operating systems use splnet().
- *
- * - splimp()
- *	NetBSD 1.6: use splnet() in network, splvm() in vm.
- *	other operating systems: use splimp().
- *
- * - dtom()
- *	NEVER USE IT!
- *
- * - struct ifnet for loopback interface
- *	BSDI3: struct ifnet loif;
- *	BSDI4: struct ifnet *loifp;
- *	NetBSD, OpenBSD 2.8, FreeBSD2: struct ifnet loif[NLOOP];
- *	OpenBSD 2.9: struct ifnet *lo0ifp;
- *
- *	odd thing is that many of them refers loif as ifnet *loif,
- *	not loif[NLOOP], from outside of if_loop.c.
- *
- * - number of bpf pseudo devices
- *	others: bpfilter.h, NBPFILTER
- *	FreeBSD4: bpf.h, NBPF
- *	solution:
- *		#if defined(__FreeBSD__) && __FreeBSD__ >= 4
- *		#include "bpf.h"
- *		#define NBPFILTER	NBPF
- *		#else
- *		#include "bpfilter.h"
- *		#endif
- *
- * - protosw for IPv4 (sys/netinet)
- *	FreeBSD4: struct ipprotosw in netinet/ipprotosw.h
- *	others: struct protosw in sys/protosw.h
- *
- * - protosw in general.
- *	NetBSD 1.5 has extra member for ipfilter (netbsd-current dropped
- *	it so it went away in 1.6).
- *	NetBSD 1.5 requires PR_LISTEN flag bit with protocols that permit
- *	listen/accept (like tcp).
- *
- * - header files with defopt (opt_xx.h)
- *	FreeBSD3: opt_{inet,ipsec,altq}.h
- *	FreeBSD4: opt_{inet,inet6,ipsec,altq}.h
- *	NetBSD: opt_{inet,ipsec,altq}.h
- *	others: does not use defopt
- *
- * - IN_MULTICAST/IN_CLASS[A-D] macro.
- *	OpenBSD and NetBSD: net endian (kernel) or host endian (userland)
- *	others: always host endian
- *
- * - (m->m_flags & M_EXT) != 0 does *not* mean that the max data length of
- *   the mbuf == MCLBYTES.
- *
- * - sys/kern/uipc_mbuf.c:m_dup()
- *	freebsd[34]: copies the whole mbuf chain.
- *	netbsd: similar arg with m_copym().
- *	others: no m_dup().
- *
- * - ifa_refcnt (struct ifaddr) management (IFAREF/IFAFREE).
- *	NetBSD 1.5: always use IFAREF whenever reference gets added.
- *		always use IFAFREE whenever reference gets freed.
- *		IFAFREE frees ifaddr when ifa_refcnt reaches 0.
- *	others: do not increase refcnt for ifp->if_addrlist and in_ifaddr.
- *		use IFAFREE once when ifaddr is disconnected from
- *		ifp->if_addrlist and in_ifaddr.  IFAFREE frees ifaddr when
- *		ifa_refcnt goes negative.  in KAME environment, IFAREF is
- *		provided as a compatibility wrapper (use it instead of
- *		ifa_refcnt++ to reduce #ifdef).
- *
- * - ifnet.if_lastchange
- *	freebsd, bsdi, netbsd-current (jun 14 2001-),
- *	openbsd-current (jun 15 2001-): updated only when IFF_UP changes.
- *		(RFC1573 ifLastChange interpretation)
- *	netbsd151, openbsd29: updated whenever packets go through the interface.
- *		(4.4BSD interpretation)
- *
- * - kernel compilation options ("options HOGE" in kernel config file)
- *	freebsd4: sys/conf/options has to have mapping between option
- *		and a header file (opt_hoge.h).
- *	netbsd: by default, -DHOGE will go into
- *		sys/arch/foo/compile/BAR/Makefile.
- *		if you define mapping in sys/conf/files, you can create
- *		a header file like opt_hoge.h to help make dependencies.
- *	bsdi/openbsd: always use -DHOGE in Makefile.  there's no need/way
- *		to have opt_hoge.h.
- *
- *	therefore, opt_hoge.h is mandatory on freebsd4 only.
- *
- * - MALLOC() macro
- *	Use it only if the size of the allocation is constant.
- *	When we do NOT collect statistics about kernel memory usage, the result
- *	of macro expansion contains a large set of condition branches.  If the
- *	size is not constant, compilation optimization cannot be applied, and
- *	a bunch of the large branch will be embedded in the kernel code.
- *
- * - M_COPY_PKTHDR
- *	openbsd30, freebsd4(after 4.8): M_COPY_PKTHDR is deprecated.
- *		use M_MOVE_PKTHDR or M_DUP_PKTHDR, depending on how you want
- *		to handle m_tag.
- *	others: M_COPY_PKTHDR is available as usual.
- *
- * - M_READONLY() macro
- *	OpenBSD 3.0 and NetBSD 1.6 has it.
- *	FreeBSD 4.x uses M_WRITABLE() macro, which is opposite (NIH!).
- *	KAME tree has it for all platforms except FreeBSD 4.x.
- *
- * - TAILQ_EMPTY
- *	BSD/OS 4.x does not have this macro.
- */
-
-#ifndef __NET_NET_OSDEP_H_DEFINED_
-#define __NET_NET_OSDEP_H_DEFINED_
-#ifdef _KERNEL
-
-#define if_name(ifp)	((ifp)->if_xname)
-
-#define HAVE_NEW_BPFATTACH
-
-#define ifa_list	ifa_link
-#define if_addrlist	if_addrhead
-#define if_list		if_link
-
-#define HAVE_PPSRATECHECK
-
-/* sys/net/if.h */
-#define WITH_CONVERT_AND_STRIP_IP_LEN
-#define WITH_CONVERT_IP_OFF
-
-#endif /*_KERNEL*/
-#endif /*__NET_NET_OSDEP_H_DEFINED_ */
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index b69346c..aac8208 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -68,8 +68,6 @@
 
 #include <net/if_gif.h>	
 
-#include <net/net_osdep.h>
-
 static int gif_validate4(const struct ip *, struct gif_softc *,
 	struct ifnet *);
 
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index c1edfc5..8a3298a 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -87,8 +87,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 static MALLOC_DEFINE(M_NETADDR, "encap_export_host", "Export host address structure");
diff --git a/sys/netinet6/ah_aesxcbcmac.c b/sys/netinet6/ah_aesxcbcmac.c
index 75c89bc..3c83d33 100644
--- a/sys/netinet6/ah_aesxcbcmac.c
+++ b/sys/netinet6/ah_aesxcbcmac.c
@@ -52,8 +52,6 @@
 
 #include <crypto/rijndael/rijndael.h>
 
-#include <net/net_osdep.h>
-
 #define AES_BLOCKSIZE	16
 
 typedef struct {
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index d24acb7..da8fa69 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -91,8 +91,6 @@
 #include <opencrypto/rmd160.h>
 #define RIPEMD160_RESULTLEN	20
 
-#include <net/net_osdep.h>
-
 static int ah_sumsiz_1216 __P((struct secasvar *));
 static int ah_sumsiz_zero __P((struct secasvar *));
 static int ah_common_mature __P((struct secasvar *));
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index c2f2fc4..4a65659 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -90,8 +90,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 #define IPLEN_FLIPPED
 
 #ifdef INET
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index bb7806e..ae688bc 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -74,8 +74,6 @@
 #include <netkey/key.h>
 #include <netkey/keydb.h>
 
-#include <net/net_osdep.h>
-
 #ifdef INET
 static struct in_addr *ah4_finaldst __P((struct mbuf *));
 #endif
diff --git a/sys/netinet6/esp_aesctr.c b/sys/netinet6/esp_aesctr.c
index 3494276..9519bb0 100644
--- a/sys/netinet6/esp_aesctr.c
+++ b/sys/netinet6/esp_aesctr.c
@@ -51,8 +51,6 @@
 
 #include <crypto/rijndael/rijndael.h>
 
-#include <net/net_osdep.h>
-
 #define AES_BLOCKSIZE	16
 
 #define NONCESIZE	4
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 43ea585..43fe8df 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -85,8 +85,6 @@
 #define cast128_decrypt(key, inblock, outblock) \
 	cast_decrypt((key), (inblock), (outblock))
 
-#include <net/net_osdep.h>
-
 static int esp_null_mature __P((struct secasvar *));
 static int esp_null_decrypt __P((struct mbuf *, size_t,
 	struct secasvar *, const struct esp_algorithm *, int));
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index ba56e89..9cdd108 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -89,8 +89,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 #define IPLEN_FLIPPED
 
 #define ESPMAXLEN \
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 660e785..3f4ffe1 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -77,8 +77,6 @@
 #include <netkey/key.h>
 #include <netkey/keydb.h>
 
-#include <net/net_osdep.h>
-
 static int esp_output __P((struct mbuf *, u_char *, struct mbuf *,
 	struct ipsecrequest *, int));
 
diff --git a/sys/netinet6/esp_rijndael.c b/sys/netinet6/esp_rijndael.c
index e302e6a..97d52d3 100644
--- a/sys/netinet6/esp_rijndael.c
+++ b/sys/netinet6/esp_rijndael.c
@@ -45,8 +45,6 @@
 
 #include <crypto/rijndael/rijndael.h>
 
-#include <net/net_osdep.h>
-
 size_t
 esp_rijndael_schedlen(algo)
 	const struct esp_algorithm *algo;
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 7bb2e0d..883ad2a 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -53,8 +53,6 @@
 #include <netinet/in_systm.h>	/* for ECN definitions */
 #include <netinet/ip.h>		/* for ECN definitions */
 
-#include <net/net_osdep.h>
-
 /*
  * Define it to get a correct behavior on per-interface statistics.
  * You will need to perform an extra routing table lookup, per fragment,
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 1af4823..470944c 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -109,8 +109,6 @@
 #include <netipsec/key.h>
 #endif
 
-#include <net/net_osdep.h>
-
 extern struct domain inet6domain;
 
 struct icmp6stat icmp6stat;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 5c05d6a..a948a44 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -97,8 +97,6 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/in6_pcb.h>
 
-#include <net/net_osdep.h>
-
 MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address");
 
 /*
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 10fb451..19b73fa 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -68,8 +68,6 @@
 #include <netinet/ip6.h>
 #include <netinet6/scope6_var.h>
 
-#include <net/net_osdep.h>
-
 /*
  * Checksum routine for Internet Protocol family headers (Portable Version).
  *
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index a96708d..2d31f38 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -68,8 +68,6 @@
 
 #include <net/if_gif.h>
 
-#include <net/net_osdep.h>
-
 static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
 			 struct ifnet *);
 
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 4d822f2..55ae4f2 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -58,8 +58,6 @@
 #include <netinet6/nd6.h>
 #include <netinet6/scope6_var.h>
 
-#include <net/net_osdep.h>
-
 unsigned long in6_maxmtu = 0;
 
 #ifdef IP6_AUTO_LINKLOCAL
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 83691ba..95d12ed 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -138,8 +138,6 @@
 
 #include <netinet6/ip6protosw.h>
 
-#include <net/net_osdep.h>
-
 /*
  * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
  */
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index be3e0f8..233d79b 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -93,8 +93,6 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 
-#include <net/net_osdep.h>
-
 static struct mtx addrsel_lock;
 #define	ADDRSEL_LOCK_INIT()	mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF)
 #define	ADDRSEL_LOCK()		mtx_lock(&addrsel_lock)
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 3c7d354..604e96a 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -80,8 +80,6 @@
 #define	IPSEC
 #endif /* FAST_IPSEC */
 
-#include <net/net_osdep.h>
-
 #include <netinet6/ip6protosw.h>
 
 struct	route_in6 ip6_forward_rt;
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index d0b881c9..e27656f 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -116,8 +116,6 @@
 
 #include <netinet6/ip6protosw.h>
 
-#include <net/net_osdep.h>
-
 extern struct domain inet6domain;
 
 u_char ip6_protox[IPPROTO_MAX];
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 9c4938f..3bbc1e0 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -117,8 +117,6 @@
 #include <netinet6/pim6.h>
 #include <netinet6/pim6_var.h>
 
-#include <net/net_osdep.h>
-
 static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry");
 
 #define M_HASCL(m) ((m)->m_flags & M_EXT)
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 98f777a..df10cbe 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -105,8 +105,6 @@
 #include <netipsec/key.h>
 #endif /* FAST_IPSEC */
 
-#include <net/net_osdep.h>
-
 #include <netinet6/ip6protosw.h>
 #include <netinet6/scope6_var.h>
 
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index bcb5cff..66367b5 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -67,8 +67,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 static void *deflate_alloc __P((void *, u_int, u_int));
 static void deflate_free __P((void *, void *));
 static int deflate_common __P((struct mbuf *, struct mbuf *, size_t *, int));
diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c
index be97fd1..abdebb2 100644
--- a/sys/netinet6/ipcomp_input.c
+++ b/sys/netinet6/ipcomp_input.c
@@ -78,8 +78,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 #define IPLEN_FLIPPED
 
 #ifdef INET
diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c
index f9286b2..3a89311 100644
--- a/sys/netinet6/ipcomp_output.c
+++ b/sys/netinet6/ipcomp_output.c
@@ -79,8 +79,6 @@
 
 #include <machine/stdarg.h>
 
-#include <net/net_osdep.h>
-
 static int ipcomp_output __P((struct mbuf *, u_char *, struct mbuf *,
 	struct ipsecrequest *, int));
 
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 08734a8..5ce3989 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -103,7 +103,6 @@
 #include <netkey/key_debug.h>
 
 #include <machine/in_cksum.h>
-#include <net/net_osdep.h>
 
 #ifdef IPSEC_DEBUG
 int ipsec_debug = 1;
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 8c0888f..bc8a7c3 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -89,8 +89,6 @@
 #include <netinet/icmp6.h>
 #include <netinet6/mld6_var.h>
 
-#include <net/net_osdep.h>
-
 /*
  * Protocol constants
  */
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index ad7e079..a09df8a 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -69,8 +69,6 @@
 
 #include <sys/limits.h>
 
-#include <net/net_osdep.h>
-
 #define ND6_SLOWTIMER_INTERVAL (60 * 60) /* 1 hour */
 #define ND6_RECALC_REACHTM_INTERVAL (60 * 120) /* 2 hours */
 
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index f762315..81123fe 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -68,8 +68,6 @@
 #include <netinet/ip_carp.h>
 #endif
 
-#include <net/net_osdep.h>
-
 #define SDL(s) ((struct sockaddr_dl *)s)
 
 struct dadq;
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 119a422..8f05346 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -60,8 +60,6 @@
 #include <netinet/icmp6.h>
 #include <netinet6/scope6_var.h>
 
-#include <net/net_osdep.h>
-
 #define SDL(s)	((struct sockaddr_dl *)s)
 
 static int rtpref __P((struct nd_defrouter *));
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 0898ea0..b7c1f54 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -105,8 +105,6 @@
 #endif
 #endif /* IPSEC */
 
-#include <net/net_osdep.h>
-
 /*
  * UDP protocol inplementation.
  * Per RFC 768, August, 1980.
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index a738e13..d41ad96 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -109,8 +109,6 @@ __FBSDID("$FreeBSD$");
 /* randomness */
 #include <sys/random.h>
 
-#include <net/net_osdep.h>
-
 #ifndef satosin
 #define satosin(s) ((struct sockaddr_in *)s)
 #endif
diff --git a/sys/netkey/keydb.c b/sys/netkey/keydb.c
index 10fd8f6..a41d505 100644
--- a/sys/netkey/keydb.c
+++ b/sys/netkey/keydb.c
@@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <netkey/key.h>
 #include <netinet6/ipsec.h>
 
-#include <net/net_osdep.h>
-
 MALLOC_DEFINE(M_SECA, "key_mgmt", "security associations, key management");
 
 /*