svn commit: r193744 - in head/sys: compat/linprocfs compat/linux compat/svr4 contrib/altq/altq contrib/pf/net dev/cxgb/ulp/iw_cxgb kern modules/bridgestp modules/cxgb/iw_cxgb modules/if_ef modules/...

Bjoern A. Zeeb bz at FreeBSD.org
Mon Jun 8 19:57:40 UTC 2009 

Author: bz
Date: Mon Jun  8 19:57:35 2009
New Revision: 193744
URL: http://svn.freebsd.org/changeset/base/193744

Log:
  After r193232 rt_tables in vnet.h are no longer indirectly dependent on
  the ROUTETABLES kernel option thus there is no need to include opt_route.h
  anymore in all consumers of vnet.h and no longer depend on it for module
  builds.
  
  Remove the hidden include in flowtable.h as well and leave the two
  explicit #includes in ip_input.c and ip_output.c.

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/modules/bridgestp/Makefile
  head/sys/modules/cxgb/iw_cxgb/Makefile
  head/sys/modules/if_ef/Makefile
  head/sys/modules/if_vlan/Makefile
  head/sys/modules/ip_mroute_mod/Makefile
  head/sys/modules/ipfw/Makefile
  head/sys/modules/linprocfs/Makefile
  head/sys/modules/linux/Makefile
  head/sys/modules/netgraph/atm/atm/Makefile
  head/sys/modules/netgraph/ether/Makefile
  head/sys/modules/netgraph/gif/Makefile
  head/sys/modules/nfsclient/Makefile
  head/sys/modules/pf/Makefile
  head/sys/modules/svr4/Makefile
  head/sys/modules/wlan/Makefile
  head/sys/net/bridgestp.c
  head/sys/net/flowtable.h
  head/sys/net/if.c
  head/sys/net/if_ef.c
  head/sys/net/if_ethersubr.c
  head/sys/net/if_loop.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/net/rtsock.c
  head/sys/net80211/ieee80211_ddb.c
  head/sys/netgraph/atm/ng_atm.c
  head/sys/netgraph/ng_ether.c
  head/sys/netgraph/ng_gif.c
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in.c
  head/sys/netinet/in_mcast.c
  head/sys/netinet/in_proto.c
  head/sys/netinet/in_rmx.c
  head/sys/netinet/ipfw/ip_fw2.c
  head/sys/netinet/raw_ip.c
  head/sys/netinet/sctp_os_bsd.h
  head/sys/netinet6/icmp6.c
  head/sys/netinet6/in6.c
  head/sys/netinet6/in6_ifattach.c
  head/sys/netinet6/in6_mcast.c
  head/sys/netinet6/in6_proto.c
  head/sys/netinet6/in6_rmx.c
  head/sys/netinet6/ip6_input.c
  head/sys/netinet6/ip6_mroute.c
  head/sys/netinet6/ip6_output.c
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6_rtr.c
  head/sys/netinet6/raw_ip6.c
  head/sys/netinet6/scope6.c
  head/sys/netipsec/keysock.c
  head/sys/netipsec/xform_ipip.c
  head/sys/nfsclient/bootp_subr.c
  head/sys/nfsclient/nfs_diskless.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/compat/linprocfs/linprocfs.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -39,7 +39,6 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  */
 
-#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/compat/linux/linux_ioctl.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>

Modified: head/sys/compat/svr4/svr4_sockio.c
==============================================================================
--- head/sys/compat/svr4/svr4_sockio.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/compat/svr4/svr4_sockio.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>

Modified: head/sys/contrib/altq/altq/altq_subr.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_subr.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/contrib/altq/altq/altq_subr.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -32,7 +32,6 @@
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
-#include "opt_route.h"
 #endif
 #endif /* __FreeBSD__ || __NetBSD__ */
 

Modified: head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- head/sys/contrib/pf/net/pf_if.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/contrib/pf/net/pf_if.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -35,7 +35,6 @@
 #if defined(__FreeBSD__)
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_bpf.h"
 #include "opt_pf.h"
 

Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
==============================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -29,8 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/kern/kern_poll.c
==============================================================================
--- head/sys/kern/kern_poll.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/kern/kern_poll.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -28,7 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_device_polling.h"
 
 #include <sys/param.h>

Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/kern/kern_uuid.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>

Modified: head/sys/modules/bridgestp/Makefile
==============================================================================
--- head/sys/modules/bridgestp/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/bridgestp/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	bridgestp
-SRCS=	bridgestp.c opt_route.h
+SRCS=	bridgestp.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/cxgb/iw_cxgb/Makefile
==============================================================================
--- head/sys/modules/cxgb/iw_cxgb/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/cxgb/iw_cxgb/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -8,7 +8,7 @@ SRCS=   iw_cxgb.c iw_cxgb_cm.c iw_cxgb_h
 SRCS+=  iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c
 SRCS+=  iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c
 SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
-SRCS+=  opt_inet.h opt_route.h
+SRCS+=  opt_inet.h
 CFLAGS+= -g -I${CXGB}
 #CFLAGS+= -DDEBUG
 

Modified: head/sys/modules/if_ef/Makefile
==============================================================================
--- head/sys/modules/if_ef/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/if_ef/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_ef
-SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h opt_route.h
+SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h
 
 .if defined(EFDEBUG)
 CFLAGS+= -DEF_DEBUG

Modified: head/sys/modules/if_vlan/Makefile
==============================================================================
--- head/sys/modules/if_vlan/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/if_vlan/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -4,6 +4,6 @@
 
 KMOD=	if_vlan
 SRCS=	if_vlan.c
-SRCS+=	opt_inet.h opt_vlan.h opt_route.h
+SRCS+=	opt_inet.h opt_vlan.h
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/ip_mroute_mod/Makefile
==============================================================================
--- head/sys/modules/ip_mroute_mod/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/ip_mroute_mod/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -7,7 +7,7 @@
 KMOD=	ip_mroute
 
 SRCS=	ip_mroute.c
-SRCS+=	opt_inet.h opt_mrouting.h opt_route.h
+SRCS+=	opt_inet.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:

Modified: head/sys/modules/ipfw/Makefile
==============================================================================
--- head/sys/modules/ipfw/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/ipfw/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -6,7 +6,7 @@
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
-SRCS+=	opt_inet6.h opt_ipsec.h opt_route.h
+SRCS+=	opt_inet6.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
 CFLAGS+= -I${.CURDIR}/../../contrib/pf

Modified: head/sys/modules/linprocfs/Makefile
==============================================================================
--- head/sys/modules/linprocfs/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/linprocfs/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -6,8 +6,7 @@ KMOD=	linprocfs
 SRCS=	vnode_if.h \
 	device_if.h bus_if.h \
 	linprocfs.c \
-	opt_compat.h \
-	opt_route.h
+	opt_compat.h
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=-DCOMPAT_LINUX32

Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/linux/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -13,7 +13,7 @@ SRCS=	linux${SFX}_dummy.c linux_emul.c l
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
-	opt_inet6.h opt_route.h opt_compat.h opt_posix.h vnode_if.h \
+	opt_inet6.h opt_compat.h opt_posix.h vnode_if.h \
 	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s

Modified: head/sys/modules/netgraph/atm/atm/Makefile
==============================================================================
--- head/sys/modules/netgraph/atm/atm/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/netgraph/atm/atm/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../../../netgraph/atm
 
 KMOD=	ng_atm
-SRCS=	ng_atm.c opt_route.h
+SRCS=	ng_atm.c
 # CFLAGS+= -DNGATM_DEBUG
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/netgraph/ether/Makefile
==============================================================================
--- head/sys/modules/netgraph/ether/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/netgraph/ether/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	ng_ether
-SRCS= 	ng_ether.c opt_route.h
+SRCS= 	ng_ether.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/netgraph/gif/Makefile
==============================================================================
--- head/sys/modules/netgraph/gif/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/netgraph/gif/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD=	ng_gif
-SRCS= 	ng_gif.c opt_inet.h opt_inet6.h opt_route.h
+SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:

Modified: head/sys/modules/nfsclient/Makefile
==============================================================================
--- head/sys/modules/nfsclient/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/nfsclient/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -7,7 +7,7 @@ SRCS=	vnode_if.h \
 	nfs_bio.c nfs_lock.c nfs_node.c nfs_socket.c nfs_subs.c nfs_nfsiod.c \
 	nfs_vfsops.c nfs_vnops.c nfs_common.c nfs_krpc.c \
 	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h opt_route.h
+SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h
 
 .if !defined(KERNBUILDDIR)
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel

Modified: head/sys/modules/pf/Makefile
==============================================================================
--- head/sys/modules/pf/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/pf/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -9,7 +9,7 @@ KMOD=	pf
 SRCS = 	pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	pf_ruleset.c \
 	in4_cksum.c \
-	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_route.h
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
 
 CFLAGS+=  -I${.CURDIR}/../../contrib/pf
 

Modified: head/sys/modules/svr4/Makefile
==============================================================================
--- head/sys/modules/svr4/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/svr4/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -9,7 +9,7 @@ SRCS=	svr4_sysent.c svr4_sysvec.c opt_co
 	svr4_machdep.c svr4_resource.c svr4_ipc.c
 OBJS=	svr4_locore.o 
 
-SRCS+=	opt_ktrace.h opt_sysvipc.h opt_route.h
+SRCS+=	opt_ktrace.h opt_sysvipc.h
 
 CLEANFILES=	svr4_assym.h svr4_genassym.o
 

Modified: head/sys/modules/wlan/Makefile
==============================================================================
--- head/sys/modules/wlan/Makefile	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/modules/wlan/Makefile	Mon Jun  8 19:57:35 2009	(r193744)
@@ -10,8 +10,7 @@ SRCS=	ieee80211.c ieee80211_crypto.c iee
 	ieee80211_radiotap.c ieee80211_regdomain.c ieee80211_ht.c \
 	ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \
 	ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
-SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h \
-	opt_route.h
+SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h
 
 .if !defined(KERNBUILDDIR)
 opt_wlan.h:

Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/bridgestp.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -37,8 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>

Modified: head/sys/net/flowtable.h
==============================================================================
--- head/sys/net/flowtable.h	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/flowtable.h	Mon Jun  8 19:57:35 2009	(r193744)
@@ -33,8 +33,6 @@ $FreeBSD$
 #define	_NET_FLOWTABLE_H_
 
 #ifdef	_KERNEL
-#include "opt_route.h"
-
 #include <net/ethernet.h>
 #include <netinet/in.h>
 

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -33,7 +33,6 @@
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 
 #include <sys/param.h>

Modified: head/sys/net/if_ef.c
==============================================================================
--- head/sys/net/if_ef.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if_ef.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -29,7 +29,6 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_ef.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if_ethersubr.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -34,7 +34,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_route.h"
 #include "opt_netgraph.h"
 #include "opt_carp.h"
 #include "opt_mbuf_profiling.h"

Modified: head/sys/net/if_loop.c
==============================================================================
--- head/sys/net/if_loop.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if_loop.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -38,7 +38,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/net/if_mib.c
==============================================================================
--- head/sys/net/if_mib.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if_mib.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -29,8 +29,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/if_vlan.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -41,7 +41,6 @@
  * and ask it to send them.
  */
 
-#include "opt_route.h"
 #include "opt_vlan.h"
 
 #include <sys/param.h>

Modified: head/sys/net/raw_cb.c
==============================================================================
--- head/sys/net/raw_cb.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/raw_cb.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -31,8 +31,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/lock.h>

Modified: head/sys/net/raw_usrreq.c
==============================================================================
--- head/sys/net/raw_usrreq.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/raw_usrreq.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -31,8 +31,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net/rtsock.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -31,7 +31,6 @@
  */
 #include "opt_sctp.h"
 #include "opt_mpath.h"
-#include "opt_route.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 

Modified: head/sys/net80211/ieee80211_ddb.c
==============================================================================
--- head/sys/net80211/ieee80211_ddb.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/net80211/ieee80211_ddb.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -27,7 +27,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_route.h"
 #include "opt_wlan.h"
 
 #ifdef DDB

Modified: head/sys/netgraph/atm/ng_atm.c
==============================================================================
--- head/sys/netgraph/atm/ng_atm.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netgraph/atm/ng_atm.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netgraph/ng_ether.c
==============================================================================
--- head/sys/netgraph/ng_ether.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netgraph/ng_ether.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -46,8 +46,6 @@
  * ng_ether(4) netgraph node type
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netgraph/ng_gif.c
==============================================================================
--- head/sys/netgraph/ng_gif.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netgraph/ng_gif.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -68,8 +68,6 @@
 /*
  * ng_gif(4) netgraph node type
  */
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/if_ether.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -39,7 +39,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 
 #include <sys/param.h>

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/igmp.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -50,8 +50,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/in.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -34,7 +34,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_carp.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/in_mcast.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/in_proto.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_mrouting.h"
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_pf.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/in_rmx.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/ipfw/ip_fw2.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #endif
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet/raw_ip.c
==============================================================================
--- head/sys/netinet/raw_ip.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/raw_ip.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>

Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet/sctp_os_bsd.h	Mon Jun  8 19:57:35 2009	(r193744)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_sctp.h"
 
 #include <sys/param.h>

Modified: head/sys/netinet6/icmp6.c
==============================================================================
--- head/sys/netinet6/icmp6.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/icmp6.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/in6.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/in6_ifattach.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

Modified: head/sys/netinet6/in6_mcast.c
==============================================================================
--- head/sys/netinet6/in6_mcast.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/in6_mcast.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -36,7 +36,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/in6_proto.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_ipstealth.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"
 #include "opt_mpath.h"

Modified: head/sys/netinet6/in6_rmx.c
==============================================================================
--- head/sys/netinet6/in6_rmx.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/in6_rmx.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -75,8 +75,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/ip6_input.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/ip6_mroute.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>

Modified: head/sys/netinet6/ip6_output.c
==============================================================================
--- head/sys/netinet6/ip6_output.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/ip6_output.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/nd6.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/nd6_rtr.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/raw_ip6.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>

Modified: head/sys/netinet6/scope6.c
==============================================================================
--- head/sys/netinet6/scope6.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netinet6/scope6.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

Modified: head/sys/netipsec/keysock.c
==============================================================================
--- head/sys/netipsec/keysock.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netipsec/keysock.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -31,7 +31,6 @@
  */
 
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 

Modified: head/sys/netipsec/xform_ipip.c
==============================================================================
--- head/sys/netipsec/xform_ipip.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/netipsec/xform_ipip.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -41,7 +41,6 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_enc.h"
 
 #include <sys/param.h>

Modified: head/sys/nfsclient/bootp_subr.c
==============================================================================
--- head/sys/nfsclient/bootp_subr.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/nfsclient/bootp_subr.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -43,7 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>

Modified: head/sys/nfsclient/nfs_diskless.c
==============================================================================
--- head/sys/nfsclient/nfs_diskless.c	Mon Jun  8 19:56:50 2009	(r193743)
+++ head/sys/nfsclient/nfs_diskless.c	Mon Jun  8 19:57:35 2009	(r193744)
@@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>

More information about the svn-src-all mailing list