svn commit: r194739 - in head/sys: compat/linprocfs compat/linux compat/svr4 contrib/altq/altq contrib/pf/net dev/cxgb/ulp/iw_cxgb kern net net80211 netgraph netgraph/atm netinet netinet6 nfsclient

Bjoern A. Zeeb bz at FreeBSD.org
Tue Jun 23 17:03:46 UTC 2009


Author: bz
Date: Tue Jun 23 17:03:45 2009
New Revision: 194739
URL: http://svn.freebsd.org/changeset/base/194739

Log:
  After cleaning up rt_tables from vnet.h and cleaning up opt_route.h
  a lot of files no longer need route.h either. Garbage collect them.
  While here remove now unneeded vnet.h #includes as well.

Modified:
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/compat/linux/linux_ioctl.c
  head/sys/compat/svr4/svr4_sockio.c
  head/sys/contrib/altq/altq/altq_subr.c
  head/sys/contrib/pf/net/pf_if.c
  head/sys/contrib/pf/net/pf_ioctl.c
  head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  head/sys/kern/kern_poll.c
  head/sys/kern/kern_uuid.c
  head/sys/net/bridgestp.c
  head/sys/net/if_ef.c
  head/sys/net/if_mib.c
  head/sys/net/if_vlan.c
  head/sys/net/raw_cb.c
  head/sys/net/raw_usrreq.c
  head/sys/net80211/ieee80211_ddb.c
  head/sys/netgraph/atm/ng_atm.c
  head/sys/netgraph/ng_ether.c
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in_pcb.h
  head/sys/netinet/in_rmx.c
  head/sys/netinet/tcp_hostcache.c
  head/sys/netinet/tcp_offload.c
  head/sys/netinet6/ip6_mroute.c
  head/sys/netinet6/scope6.c
  head/sys/nfsclient/nfs_diskless.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/compat/linprocfs/linprocfs.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <vm/vm.h>

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/compat/linux/linux_ioctl.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #ifdef COMPAT_LINUX32

Modified: head/sys/compat/svr4/svr4_sockio.c
==============================================================================
--- head/sys/compat/svr4/svr4_sockio.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/compat/svr4/svr4_sockio.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <compat/svr4/svr4.h>

Modified: head/sys/contrib/altq/altq/altq_subr.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_subr.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/contrib/altq/altq/altq_subr.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -55,7 +55,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 

Modified: head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- head/sys/contrib/pf/net/pf_if.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/contrib/pf/net/pf_if.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #ifdef __FreeBSD__
 #include <net/vnet.h>
 #endif

Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
==============================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_var.h>
 #if __FreeBSD_version >= 800056
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 

Modified: head/sys/kern/kern_poll.c
==============================================================================
--- head/sys/kern/kern_poll.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/kern/kern_poll.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
-#include <net/route.h>
 #include <net/vnet.h>
 
 static int poll_switch(SYSCTL_HANDLER_ARGS);

Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/kern/kern_uuid.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/bridgestp.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/net/if_ef.c
==============================================================================
--- head/sys/net/if_ef.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/if_ef.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -48,7 +48,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <net/bpf.h>
 #include <net/vnet.h>
 

Modified: head/sys/net/if_mib.c
==============================================================================
--- head/sys/net/if_mib.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/if_mib.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -38,7 +38,6 @@
 
 #include <net/if.h>
 #include <net/if_mib.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/if_vlan.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -64,7 +64,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #define VLANNAME	"vlan"

Modified: head/sys/net/raw_cb.c
==============================================================================
--- head/sys/net/raw_cb.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/raw_cb.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -46,7 +46,6 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*

Modified: head/sys/net/raw_usrreq.c
==============================================================================
--- head/sys/net/raw_usrreq.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net/raw_usrreq.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -48,7 +48,6 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);

Modified: head/sys/net80211/ieee80211_ddb.c
==============================================================================
--- head/sys/net80211/ieee80211_ddb.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/net80211/ieee80211_ddb.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>

Modified: head/sys/netgraph/atm/ng_atm.c
==============================================================================
--- head/sys/netgraph/atm/ng_atm.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netgraph/atm/ng_atm.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>

Modified: head/sys/netgraph/ng_ether.c
==============================================================================
--- head/sys/netgraph/ng_ether.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netgraph/ng_ether.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -63,7 +63,6 @@
 #include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_bridgevar.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/if_ether.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -56,11 +56,10 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/netisr.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
-#include <net/vnet.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/igmp.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/in_pcb.h	Tue Jun 23 17:03:45 2009	(r194739)
@@ -39,8 +39,6 @@
 #include <sys/_mutex.h>
 #include <sys/_rwlock.h>
 
-#include <net/route.h>
-
 #ifdef _KERNEL
 #include <sys/rwlock.h>
 #endif

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/in_rmx.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/route.h>
-#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>

Modified: head/sys/netinet/tcp_hostcache.c
==============================================================================
--- head/sys/netinet/tcp_hostcache.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/tcp_hostcache.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

Modified: head/sys/netinet/tcp_offload.c
==============================================================================
--- head/sys/netinet/tcp_offload.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet/tcp_offload.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet6/ip6_mroute.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -108,7 +108,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/netinet6/scope6.c
==============================================================================
--- head/sys/netinet6/scope6.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/netinet6/scope6.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/vimage.h>
 
-#include <net/route.h>
 #include <net/if.h>
 #include <net/vnet.h>
 

Modified: head/sys/nfsclient/nfs_diskless.c
==============================================================================
--- head/sys/nfsclient/nfs_diskless.c	Tue Jun 23 16:50:23 2009	(r194738)
+++ head/sys/nfsclient/nfs_diskless.c	Tue Jun 23 17:03:45 2009	(r194739)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>


More information about the svn-src-head mailing list