d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rather than using hidden includes (with cicular dependencies),

Browse Source 
directly include only the header files needed. This reduces the
unneeded spamming of various headers into lots of files.

For now, this leaves us with very few modules including vnet.h
and thus needing to depend on opt_route.h.

Reviewed by:	brooks, gnn, des, zec, imp
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
bz 2008-12-02 21:37:28 +00:00
parent 94db7634b6
commit 604d89458a
125 changed files with 214 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/compat/linprocfs/linprocfs.c
View File

@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
#include <sys/vimage.h>
#include <net/if.h>
#include <net/vnet.h>
#include <vm/vm.h>
#include <vm/pmap.h>

1
sys/compat/linux/linux_ioctl.c
View File

@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/vnet.h>
#ifdef COMPAT_LINUX32
#include <machine/../linux32/linux.h>

3
sys/compat/linux/linux_socket.c
View File

@ -52,12 +52,15 @@ __FBSDID("$FreeBSD$");
#include <sys/un.h>
#include <sys/vimage.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_var.h>
#include <netinet6/vinet6.h>
#endif
#ifdef COMPAT_LINUX32

1
sys/compat/svr4/svr4_sockio.c
View File

@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/vimage.h>
#include <net/if.h>
#include <net/vnet.h>
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_util.h>

1
sys/contrib/altq/altq/altq_subr.c
View File

@ -51,6 +51,7 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>

3
sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
View File

@ -112,6 +112,9 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12
#include "netinet/ip_scan.h"
#endif
#include "netinet/ip_pool.h"
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056)
# include <netinet/vinet.h>
#endif
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
#endif

2
sys/contrib/ipfilter/netinet/mlfk_ipl.c
View File

@ -43,9 +43,7 @@ static int sysctl_ipf_int ( SYSCTL_HANDLER_ARGS );
static int ipf_modload(void);
static int ipf_modunload(void);
#if __FreeBSD_version < 800055
SYSCTL_DECL(_net_inet);
#endif
#define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, val, sysctl_ipf_int, "I", descr);

4
sys/contrib/pf/net/pf.c
View File

@ -120,6 +120,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/udp_var.h>
#include <netinet/icmp_var.h>
#include <netinet/if_ether.h>
#ifdef __FreeBSD__
#include <netinet/vinet.h>
#endif
#ifndef __FreeBSD__
#include <dev/rndvar.h>
@ -139,6 +142,7 @@ __FBSDID("$FreeBSD$");
#ifdef __FreeBSD__
#include <netinet6/ip6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/vinet6.h>
#endif
#endif /* INET6 */

5
sys/contrib/pf/net/pf_if.c
View File

@ -54,10 +54,15 @@ __FBSDID("$FreeBSD$");
#include <sys/device.h>
#endif
#include <sys/time.h>
#ifdef __FreeBSD__
#include <sys/vimage.h>
#endif
#include <net/if.h>
#include <net/if_types.h>
#ifdef __FreeBSD__
#include <net/vnet.h>
#endif
#include <netinet/in.h>
#include <netinet/in_var.h>

3
sys/contrib/pf/net/pf_ioctl.c
View File

@ -102,6 +102,9 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_types.h>
#include <net/route.h>
#ifdef __FreeBSD__
#include <net/vnet.h>
#endif
#include <netinet/in.h>
#include <netinet/in_var.h>

1
sys/contrib/pf/net/pf_subr.c
View File

@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/if_ether.h>
#include <netinet/vinet.h>
#include <net/pfvar.h>
/*

1
sys/contrib/rdma/rdma_cma.c
View File

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_pcb.h>
#include <netinet/vinet.h>
#include <contrib/rdma/rdma_cm.h>
#include <contrib/rdma/ib_cache.h>

3
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
View File

@ -62,6 +62,9 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#if __FreeBSD_version >= 800056
#include <net/vnet.h>
#endif
#include <netinet/in.h>

3
sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
View File

@ -78,6 +78,9 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_seq.h>
#include <netinet/tcp_syncache.h>
#include <netinet/tcp_timer.h>
#if __FreeBSD_version >= 800056
#include <netinet/vinet.h>
#endif
#include <net/route.h>
#include <t3cdev.h>

1
sys/kern/kern_poll.c
View File

@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h> /* for IFF_* flags */
#include <net/netisr.h> /* for NETISR_POLL */
#include <net/vnet.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>

1
sys/kern/kern_uuid.c
View File

@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/vnet.h>
/*
* See also:

2
sys/modules/ae/Makefile
View File

@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/ae
KMOD= if_ae
SRCS= if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h opt_route.h
SRCS= if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h
.include <bsd.kmod.mk>

2
sys/modules/ath/Makefile
View File

@ -66,7 +66,7 @@ SRCS+= ${AR5211_SRCS}
SRCS+= ${AR5212_SRCS}
SRCS+= ${AR5416_SRCS}
SRCS+= ${AR9160_SRCS}
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ath.h opt_ah.h
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal

2
sys/modules/ath_rate_amrr/Makefile
View File

@ -33,7 +33,7 @@
KMOD= ath_rate
SRCS= amrr.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal

2
sys/modules/ath_rate_onoe/Makefile
View File

@ -33,7 +33,7 @@
KMOD= ath_rate
SRCS= onoe.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal

2
sys/modules/ath_rate_sample/Makefile
View File

@ -33,7 +33,7 @@
KMOD= ath_rate
SRCS= sample.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal

2
sys/modules/bridgestp/Makefile
View File

@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../net
KMOD= bridgestp
SRCS= bridgestp.c
SRCS= bridgestp.c opt_route.h
.include <bsd.kmod.mk>

3
sys/modules/cxgb/iw_cxgb/Makefile
View File

@ -7,7 +7,8 @@ KMOD= iw_cxgb
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 opt_inet.h
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
CFLAGS+= -g -I${CXGB}
#CFLAGS+= -DDEBUG

2
sys/modules/if_ef/Makefile
View File

@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_ef
SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h
SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h opt_route.h
.if defined(EFDEBUG)
CFLAGS+= -DEF_DEBUG

2
sys/modules/if_vlan/Makefile
View File

@ -4,6 +4,6 @@
KMOD= if_vlan
SRCS= if_vlan.c
SRCS+= opt_inet.h opt_vlan.h
SRCS+= opt_inet.h opt_vlan.h opt_route.h
.include <bsd.kmod.mk>

2
sys/modules/ip_mroute_mod/Makefile
View File

@ -7,7 +7,7 @@
KMOD= ip_mroute
SRCS= ip_mroute.c
SRCS+= opt_inet.h opt_mac.h opt_mrouting.h
SRCS+= opt_inet.h opt_mac.h opt_mrouting.h opt_route.h
SRCS+= opt_inet6.h
.if ${MK_INET6_SUPPORT} != "no"

2
sys/modules/ipfw/Makefile
View File

@ -6,7 +6,7 @@
KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
SRCS+= opt_inet6.h opt_ipsec.h opt_mac.h
SRCS+= opt_inet6.h opt_ipsec.h opt_mac.h opt_route.h
CFLAGS+= -DIPFIREWALL
CFLAGS+= -I${.CURDIR}/../../contrib/pf

3
sys/modules/linprocfs/Makefile
View File

@ -5,7 +5,8 @@
KMOD= linprocfs
SRCS= vnode_if.h \
linprocfs.c \
opt_compat.h
opt_compat.h \
opt_route.h
.if ${MACHINE_ARCH} == "amd64"
CFLAGS+=-DCOMPAT_LINUX32

2
sys/modules/linux/Makefile
View File

@ -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_mac.h opt_compat.h opt_posix.h vnode_if.h \
opt_inet6.h opt_route.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
device_if.h bus_if.h assym.s
# XXX: for assym.s

2
sys/modules/netgraph/atm/atm/Makefile
View File

@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/../../../../netgraph/atm
KMOD= ng_atm
SRCS= ng_atm.c
SRCS= ng_atm.c opt_route.h
# CFLAGS+= -DNGATM_DEBUG
.include <bsd.kmod.mk>

2
sys/modules/netgraph/ether/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
KMOD= ng_ether
SRCS= ng_ether.c
SRCS= ng_ether.c opt_route.h
.include <bsd.kmod.mk>

2
sys/modules/netgraph/gif/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
KMOD= ng_gif
SRCS= ng_gif.c opt_inet.h opt_inet6.h
SRCS= ng_gif.c opt_inet.h opt_inet6.h opt_route.h
.if !defined(KERNBUILDDIR)
opt_inet.h:

2
sys/modules/nfsclient/Makefile
View File

@ -10,7 +10,7 @@ SRCS= vnode_if.h \
opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
SRCS+= nfs4_dev.c nfs4_idmap.c nfs4_socket.c nfs4_subs.c \
nfs4_vfs_subs.c nfs4_vfsops.c nfs4_vn_subs.c nfs4_vnops.c
SRCS+= opt_inet6.h opt_kgssapi.h
SRCS+= opt_inet6.h opt_kgssapi.h opt_route.h
# USE THE RPCCLNT:
CFLAGS+= -DRPCCLNT_DEBUG

2
sys/modules/pf/Makefile
View File

@ -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_mac.h
opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_mac.h opt_route.h
CFLAGS+= -I${.CURDIR}/../../contrib/pf

3
sys/modules/wlan/Makefile
View File

@ -10,7 +10,8 @@ SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.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
SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h \
opt_route.h
.if !defined(KERNBUILDDIR)
opt_wlan.h:

1
sys/net/bridgestp.c
View File

@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_types.h>
#include <net/if_llc.h>
#include <net/if_media.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>

2
sys/net/if.c
View File

@ -67,6 +67,7 @@
#include <net/if_var.h>
#include <net/radix.h>
#include <net/route.h>
#include <net/vnet.h>
#if defined(INET) || defined(INET6)
/*XXX*/
@ -79,6 +80,7 @@
#endif
#ifdef INET
#include <netinet/if_ether.h>
#include <netinet/vinet.h>
#endif
#ifdef DEV_CARP
#include <netinet/ip_carp.h>

2
sys/net/if_bridge.c
View File

@ -115,9 +115,11 @@ __FBSDID("$FreeBSD$");
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/vinet6.h>
#endif
#ifdef DEV_CARP
#include <netinet/ip_carp.h>

1
sys/net/if_ef.c
View File

@ -50,6 +50,7 @@
#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
#include <net/vnet.h>
#ifdef INET
#include <netinet/in.h>

1
sys/net/if_ethersubr.c
View File

@ -63,6 +63,7 @@
#include <net/if_bridgevar.h>
#include <net/if_vlan_var.h>
#include <net/pf_mtag.h>
#include <net/vnet.h>
#if defined(INET) || defined(INET6)
#include <netinet/in.h>

1
sys/net/if_faith.c
View File

@ -77,6 +77,7 @@
#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/vinet6.h>
#endif
#define FAITHNAME "faith"

1
sys/net/if_gre.c
View File

@ -79,6 +79,7 @@
#include <netinet/ip_gre.h>
#include <netinet/ip_var.h>
#include <netinet/ip_encap.h>
#include <netinet/vinet.h>
#else
#error "Huh? if_gre without inet?"
#endif

1
sys/net/if_loop.c
View File

@ -57,6 +57,7 @@
#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
#include <net/vnet.h>
#ifdef INET
#include <netinet/in.h>

1
sys/net/if_mib.c
View File

@ -38,6 +38,7 @@
#include <net/if.h>
#include <net/if_mib.h>
#include <net/vnet.h>
/*
* A sysctl(3) MIB for generic interface information. This information

1
sys/net/if_spppsubr.c
View File

@ -56,6 +56,7 @@
#ifdef INET
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/vinet.h>
#endif
#ifdef INET6

1
sys/net/if_stf.c
View File

@ -107,6 +107,7 @@
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/in_var.h>
#include <netinet/vinet.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>

2
sys/net/if_var.h
View File

@ -720,8 +720,6 @@ int ether_poll_register(poll_handler_t *h, struct ifnet *ifp);
int ether_poll_deregister(struct ifnet *ifp);
#endif /* DEVICE_POLLING */
#include <net/vnet.h>
#endif /* _KERNEL */
#endif /* !_NET_IF_VAR_H_ */

1
sys/net/if_vlan.c
View File

@ -64,6 +64,7 @@
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/if_vlan_var.h>
#include <net/vnet.h>
#define VLANNAME "vlan"
#define VLAN_DEF_HWIDTH 4

1
sys/net/raw_cb.c
View File

@ -46,6 +46,7 @@
#include <net/if.h>
#include <net/raw_cb.h>
#include <net/vnet.h>
/*
* Routines to manage the raw protocol control blocks.

1
sys/net/raw_usrreq.c
View File

@ -48,6 +48,7 @@
#include <net/if.h>
#include <net/raw_cb.h>
#include <net/vnet.h>
MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);

2
sys/net/route.c
View File

@ -57,9 +57,11 @@
#ifdef RADIX_MPATH
#include <net/radix_mpath.h>
#endif
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/ip_mroute.h>
#include <netinet/vinet.h>
#include <vm/uma.h>

1
sys/net/rtsock.c
View File

@ -54,6 +54,7 @@
#include <net/netisr.h>
#include <net/raw_cb.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#ifdef INET6

1
sys/net80211/ieee80211_ddb.c
View File

@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_media.h>
#include <net/if_types.h>
#include <net/ethernet.h>
#include <net/vnet.h>
#include <net80211/ieee80211_var.h>

1
sys/netgraph/atm/ng_atm.c
View File

@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_atm.h>
#include <net/vnet.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>

1
sys/netgraph/ng_eiface.c
View File

@ -43,6 +43,7 @@
#include <net/if.h>
#include <net/if_types.h>
#include <net/netisr.h>
#include <net/route.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>

1
sys/netgraph/ng_ether.c
View File

@ -63,6 +63,7 @@
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_bridgevar.h>
#include <net/vnet.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>

1
sys/netgraph/ng_gif.c
View File

@ -84,6 +84,7 @@
#include <net/if_types.h>
#include <net/if_var.h>
#include <net/if_gif.h>
#include <net/vnet.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>

2
sys/netinet/if_ether.c
View File

@ -61,10 +61,12 @@ __FBSDID("$FreeBSD$");
#include <net/netisr.h>
#include <net/if_llc.h>
#include <net/ethernet.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/if_ether.h>
#include <netinet/vinet.h>
#include <net/if_arc.h>
#include <net/iso88025.h>

2
sys/netinet/igmp.c
View File

@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
@ -70,6 +71,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_options.h>
#include <netinet/igmp.h>
#include <netinet/igmp_var.h>
#include <netinet/vinet.h>
#include <machine/in_cksum.h>

1
sys/netinet/in.c
View File

@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in_var.h>
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
#include <netinet/vinet.h>
static int in_mask2len(struct in_addr *);
static void in_len2mask(struct in_addr *, int);

4
sys/netinet/in.h
View File

@ -743,8 +743,4 @@ void in_ifdetach(struct ifnet *);
#undef __KAME_NETINET_IN_H_INCLUDED_
#endif
#ifdef _KERNEL
#include <netinet/vinet.h>
#endif
#endif /* !_NETINET_IN_H_*/

1
sys/netinet/in_gif.c
View File

@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in_var.h>
#include <netinet/ip_encap.h>
#include <netinet/ip_ecn.h>
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet/ip6.h>

2
sys/netinet/in_mcast.c
View File

@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_dl.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@ -60,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
#include <netinet/igmp_var.h>
#include <netinet/vinet.h>
#ifndef __SOCKUNION_DECLARED
union sockunion {

2
sys/netinet/in_pcb.c
View File

@ -71,9 +71,11 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_var.h>
#include <netinet/udp.h>
#include <netinet/udp_var.h>
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/vinet6.h>
#endif /* INET6 */

3
sys/netinet/in_rmx.c
View File

@ -55,9 +55,12 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
#include <netinet/vinet.h>
extern int in_inithead(void **head, int off);

2
sys/netinet/ip6.h
View File

@ -347,8 +347,6 @@ do { \
} \
} while (/*CONSTCOND*/ 0)
#include <netinet6/vinet6.h>
#endif /*_KERNEL*/
#endif /* not _NETINET_IP6_H_ */

2
sys/netinet/ip_carp.c
View File

@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_var.h>
#include <netinet/if_ether.h>
#include <machine/in_cksum.h>
#include <netinet/vinet.h>
#endif
#ifdef INET6
@ -82,6 +83,7 @@ __FBSDID("$FreeBSD$");
#include <netinet6/ip6_var.h>
#include <netinet6/scope6_var.h>
#include <netinet6/nd6.h>
#include <netinet6/vinet6.h>
#endif
#include <crypto/sha1.h>

1
sys/netinet/ip_divert.c
View File

@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_divert.h>
#include <netinet/ip_var.h>
#include <netinet/ip_fw.h>
#include <netinet/vinet.h>
#include <security/mac/mac_framework.h>

1
sys/netinet/ip_fastfwd.c
View File

@ -103,6 +103,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_var.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip_options.h>
#include <netinet/vinet.h>
#include <machine/in_cksum.h>

3
sys/netinet/ip_fw2.c
View File

@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
#include <net/radix.h>
#include <net/route.h>
#include <net/pf_mtag.h>
#include <net/vnet.h>
#define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */
@ -91,6 +92,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/udp.h>
#include <netinet/udp_var.h>
#include <netinet/sctp.h>
#include <netinet/vinet.h>
#include <netgraph/ng_ipfw.h>
#include <altq/if_altq.h>

1
sys/netinet/ip_icmp.c
View File

@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_var.h>
#include <netinet/tcpip.h>
#include <netinet/icmp_var.h>
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

1
sys/netinet/ip_id.c
View File

@ -104,6 +104,7 @@ static int sysctl_ip_id_change(SYSCTL_HANDLER_ARGS);
MTX_SYSINIT(ip_id_mtx, &ip_id_mtx, "ip_id_mtx", MTX_DEF);
SYSCTL_DECL(_net_inet_ip);
SYSCTL_PROC(_net_inet_ip, OID_AUTO, random_id_period, CTLTYPE_INT|CTLFLAG_RW,
&array_size, 0, sysctl_ip_id_change, "IU", "IP ID Array size");
SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id_collisions, CTLFLAG_RD,

2
sys/netinet/ip_input.c
View File

@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@ -70,6 +71,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_icmp.h>
#include <netinet/ip_options.h>
#include <machine/in_cksum.h>
#include <netinet/vinet.h>
#ifdef DEV_CARP
#include <netinet/ip_carp.h>
#endif

1
sys/netinet/ip_ipsec.c
View File

@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_var.h>
#include <netinet/ip_options.h>
#include <netinet/ip_ipsec.h>
#include <netinet/vinet.h>
#include <machine/in_cksum.h>

2
sys/netinet/ip_mroute.c
View File

@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/pim.h>
#include <netinet/pim_var.h>
#include <netinet/udp.h>
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet6/in6_var.h>

1
sys/netinet/ip_options.c
View File

@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_options.h>
#include <netinet/ip_icmp.h>
#include <machine/in_cksum.h>
#include <netinet/vinet.h>
#include <sys/socketvar.h>

2
sys/netinet/ip_output.c
View File

@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
#ifdef RADIX_MPATH
#include <net/radix_mpath.h>
#endif
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
#include <netinet/ip_options.h>
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netinet/ip_ipsec.h>

2
sys/netinet/raw_ip.c
View File

@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@ -69,6 +70,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_fw.h>
#include <netinet/ip_dummynet.h>
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

2
sys/netinet/sctp_os_bsd.h
View File

@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_var.h>
#include <netinet/ip_icmp.h>
#include <netinet/icmp_var.h>
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

2
sys/netinet/tcp_hostcache.c
View File

@ -92,6 +92,8 @@ __FBSDID("$FreeBSD$");
#endif
#include <netinet/tcp.h>
#include <netinet/tcp_var.h>
#include <netinet/tcp_hostcache.h>
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet6/tcp6_var.h>
#endif

5
sys/netinet/tcp_input.c
View File

@ -87,6 +87,11 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif /* TCPDEBUG */
#include <netinet/vinet.h>
#ifdef INET6
#include <netinet6/vinet6.h>
#endif
#ifdef IPSEC
#include <netipsec/ipsec.h>

1
sys/netinet/tcp_offload.c
View File

@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_var.h>
#include <netinet/tcp_offload.h>
#include <netinet/toedev.h>
#include <netinet/vinet.h>
uint32_t toedev_registration_count;

2
sys/netinet/tcp_output.c
View File

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/vimage.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
@ -74,6 +75,7 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

1
sys/netinet/tcp_reass.c
View File

@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif /* TCPDEBUG */
#include <netinet/vinet.h>
#ifdef VIMAGE_GLOBALS
static int tcp_reass_maxseg;

1
sys/netinet/tcp_sack.c
View File

@ -119,6 +119,7 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif /* TCPDEBUG */
#include <netinet/vinet.h>
#include <machine/in_cksum.h>

2
sys/netinet/tcp_subr.c
View File

@ -94,7 +94,9 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif
#include <netinet/vinet.h>
#include <netinet6/ip6protosw.h>
#include <netinet6/vinet6.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

1
sys/netinet/tcp_syncache.c
View File

@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
#ifdef INET6
#include <netinet6/tcp6_var.h>
#endif
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

2
sys/netinet/tcp_timer.c
View File

@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/vimage.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
@ -64,6 +65,7 @@ __FBSDID("$FreeBSD$");
#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
#endif
#include <netinet/vinet.h>
int tcp_keepinit;
SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, CTLTYPE_INT|CTLFLAG_RW,

1
sys/netinet/tcp_timewait.c
View File

@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_debug.h>
#endif
#include <netinet6/ip6protosw.h>
#include <netinet/vinet.h>
#include <machine/in_cksum.h>

1
sys/netinet/tcp_usrreq.c
View File

@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_debug.h>
#endif
#include <netinet/tcp_offload.h>
#include <netinet/vinet.h>
/*
* TCP protocol interface to socket abstraction.

1
sys/netinet/udp_usrreq.c
View File

@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
#endif
#include <netinet/udp.h>
#include <netinet/udp_var.h>
#include <netinet/vinet.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

2
sys/netinet/vinet.h
View File

@ -37,8 +37,6 @@
#include <sys/sysctl.h>
#include <sys/md5.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>

1
sys/netinet6/dest6.c
View File

@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet/icmp6.h>
#include <netinet6/vinet6.h>
/*
* Destination options header processing.

1
sys/netinet6/frag6.c
View File

@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/icmp6.h>
#include <netinet/in_systm.h> /* for ECN definitions */
#include <netinet/ip.h> /* for ECN definitions */
#include <netinet6/vinet6.h>
#include <security/mac/mac_framework.h>

4
sys/netinet6/icmp6.c
View File

@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_pcb.h>
@ -94,6 +95,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#include <netinet/tcp_var.h>
#include <netinet/vinet.h>
#include <netinet6/in6_ifattach.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/ip6protosw.h>
@ -101,6 +104,7 @@ __FBSDID("$FreeBSD$");
#include <netinet6/scope6_var.h>
#include <netinet6/mld6_var.h>
#include <netinet6/nd6.h>
#include <netinet6/vinet6.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>

2
sys/netinet6/in6.c
View File

@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_types.h>
#include <net/route.h>
#include <net/if_dl.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
@ -100,6 +101,7 @@ __FBSDID("$FreeBSD$");
#include <netinet6/in6_ifattach.h>
#include <netinet6/scope6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/vinet6.h>
MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address");

1
sys/netinet6/in6_gif.c
View File

@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_ecn.h>
#ifdef INET6
#include <netinet6/ip6_ecn.h>
#include <netinet6/vinet6.h>
#endif
#include <net/if_gif.h>

3
sys/netinet6/in6_ifattach.c
View File

@ -46,11 +46,13 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/if_ether.h>
#include <netinet/in_pcb.h>
#include <netinet/vinet.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
@ -60,6 +62,7 @@ __FBSDID("$FreeBSD$");
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
#include <netinet6/scope6_var.h>
#include <netinet6/vinet6.h>
#ifdef VIMAGE_GLOBALS
unsigned long in6_maxmtu;

2
sys/netinet6/in6_pcb.c
View File

@ -96,12 +96,14 @@ __FBSDID("$FreeBSD$");
#include <netinet/tcp_var.h>
#include <netinet/ip6.h>
#include <netinet/ip_var.h>
#include <netinet/vinet.h>
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
#include <netinet/in_pcb.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/scope6_var.h>
#include <netinet6/vinet6.h>
#include <security/mac/mac_framework.h>

1
sys/netinet6/in6_proto.c
View File

@ -128,6 +128,7 @@ __FBSDID("$FreeBSD$");
#endif /* IPSEC */
#include <netinet6/ip6protosw.h>
#include <netinet6/vinet6.h>
/*
* TCP/IP protocol family: IP6, ICMP6, UDP, TCP.

Some files were not shown because too many files have changed in this diff Show More