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.

30 files changed, 0 insertions, 59 deletions

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.