Skip to content

Commit

Permalink
After r193232 rt_tables in vnet.h are no longer indirectly dependent on
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
bz authored and bz committed Jun 8, 2009
1 parent 76bed24 commit b7ff2bd
Show file tree
Hide file tree
Showing 65 changed files with 15 additions and 84 deletions.
1 change: 0 additions & 1 deletion sys/compat/linprocfs/linprocfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/compat/linux/linux_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sys/compat/svr4/svr4_sockio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/contrib/altq/altq/altq_subr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "opt_inet.h"
#ifdef __FreeBSD__
#include "opt_inet6.h"
#include "opt_route.h"
#endif
#endif /* __FreeBSD__ || __NetBSD__ */

Expand Down
1 change: 0 additions & 1 deletion sys/contrib/pf/net/pf_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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$");
Expand Down
1 change: 0 additions & 1 deletion sys/contrib/pf/net/pf_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/kern/kern_poll.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

#include "opt_route.h"
#include "opt_device_polling.h"

#include <sys/param.h>
Expand Down
2 changes: 0 additions & 2 deletions sys/kern/kern_uuid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/bridgestp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../net

KMOD= bridgestp
SRCS= bridgestp.c opt_route.h
SRCS= bridgestp.c

.include <bsd.kmod.mk>
2 changes: 1 addition & 1 deletion sys/modules/cxgb/iw_cxgb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRCS= iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c
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

Expand Down
2 changes: 1 addition & 1 deletion sys/modules/if_ef/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/if_vlan/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion sys/modules/ip_mroute_mod/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/ipfw/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions sys/modules/linprocfs/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/linux/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \
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
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/netgraph/atm/atm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion sys/modules/netgraph/ether/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

KMOD= ng_ether
SRCS= ng_ether.c opt_route.h
SRCS= ng_ether.c

.include <bsd.kmod.mk>
2 changes: 1 addition & 1 deletion sys/modules/netgraph/gif/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/nfsclient/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sys/modules/pf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sys/modules/svr4/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \
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

Expand Down
3 changes: 1 addition & 2 deletions sys/modules/wlan/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
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:
Expand Down
2 changes: 0 additions & 2 deletions sys/net/bridgestp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sys/net/flowtable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
#define _NET_FLOWTABLE_H_

#ifdef _KERNEL
#include "opt_route.h"

#include <net/ethernet.h>
#include <netinet/in.h>

Expand Down
1 change: 0 additions & 1 deletion sys/net/if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/net/if_ef.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/net/if_ethersubr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion sys/net/if_loop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sys/net/if_mib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
* $FreeBSD$
*/

#include "opt_route.h"

#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
Expand Down
1 change: 0 additions & 1 deletion sys/net/if_vlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
* and ask it to send them.
*/

#include "opt_route.h"
#include "opt_vlan.h"

#include <sys/param.h>
Expand Down
2 changes: 0 additions & 2 deletions sys/net/raw_cb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
* $FreeBSD$
*/

#include "opt_route.h"

#include <sys/param.h>
#include <sys/domain.h>
#include <sys/lock.h>
Expand Down
2 changes: 0 additions & 2 deletions sys/net/raw_usrreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
* $FreeBSD$
*/

#include "opt_route.h"

#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/lock.h>
Expand Down
1 change: 0 additions & 1 deletion sys/net/rtsock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
*/
#include "opt_sctp.h"
#include "opt_mpath.h"
#include "opt_route.h"
#include "opt_inet.h"
#include "opt_inet6.h"

Expand Down
1 change: 0 additions & 1 deletion sys/net80211/ieee80211_ddb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
__FBSDID("$FreeBSD$");

#include "opt_ddb.h"
#include "opt_route.h"
#include "opt_wlan.h"

#ifdef DDB
Expand Down
2 changes: 0 additions & 2 deletions sys/netgraph/atm/ng_atm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sys/netgraph/ng_ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sys/netgraph/ng_gif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/netinet/if_ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
__FBSDID("$FreeBSD$");

#include "opt_inet.h"
#include "opt_route.h"
#include "opt_carp.h"

#include <sys/param.h>
Expand Down
2 changes: 0 additions & 2 deletions sys/netinet/igmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/netinet/in.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
__FBSDID("$FreeBSD$");

#include "opt_carp.h"
#include "opt_route.h"

#include <sys/param.h>
#include <sys/systm.h>
Expand Down
2 changes: 0 additions & 2 deletions sys/netinet/in_mcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/netinet/in_proto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions sys/netinet/in_rmx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion sys/netinet/ipfw/ip_fw2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit b7ff2bd

Please sign in to comment.