diff options
125 files changed, 212 insertions, 56 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 7c7380b..9b6880d 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -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> diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index df081a7..967ab71 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -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> diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7875d40..af133d9 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -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 diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index b1fcd3e..6ed4e69 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -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> diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 0dd1801..a689fac 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -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> diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index f0604b0..3bef15c 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -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 diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 0b462d9..36048e4 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -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); diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index 7ac43da..2959830 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -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 */ diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c index 299d9e6..62dbbf2 100644 --- a/sys/contrib/pf/net/pf_if.c +++ b/sys/contrib/pf/net/pf_if.c @@ -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> diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c index 286fc31..6d509c5 100644 --- a/sys/contrib/pf/net/pf_ioctl.c +++ b/sys/contrib/pf/net/pf_ioctl.c @@ -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> diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c index 5ea4b71..3b680e3 100644 --- a/sys/contrib/pf/net/pf_subr.c +++ b/sys/contrib/pf/net/pf_subr.c @@ -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> /* diff --git a/sys/contrib/rdma/rdma_cma.c b/sys/contrib/rdma/rdma_cma.c index 6b3c88d..d5f7cae 100644 --- a/sys/contrib/rdma/rdma_cma.c +++ b/sys/contrib/rdma/rdma_cma.c @@ -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> diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c index d2e3fe7..db1c406 100644 --- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c +++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c @@ -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> diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c index 0fe4416..334f315 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c @@ -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> diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index 2cebab9..48a3a09 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -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> diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c index 8677f7a..f8b547c 100644 --- a/sys/kern/kern_uuid.c +++ b/sys/kern/kern_uuid.c @@ -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: diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile index fd810e9..4cd97a1 100644 --- a/sys/modules/ae/Makefile +++ b/sys/modules/ae/Makefile @@ -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> diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 6105fd9..4f478f6 100644 --- a/sys/modules/ath/Makefile +++ b/sys/modules/ath/Makefile @@ -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 diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile index e3c3cb5..cbeea9c 100644 --- a/sys/modules/ath_rate_amrr/Makefile +++ b/sys/modules/ath_rate_amrr/Makefile @@ -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 diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile index eea8cbe..fe725e4 100644 --- a/sys/modules/ath_rate_onoe/Makefile +++ b/sys/modules/ath_rate_onoe/Makefile @@ -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 diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile index b3e3a6c..c179d10 100644 --- a/sys/modules/ath_rate_sample/Makefile +++ b/sys/modules/ath_rate_sample/Makefile @@ -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 diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile index 3cfc6e3..e27bbc3e 100644 --- a/sys/modules/bridgestp/Makefile +++ b/sys/modules/bridgestp/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../net KMOD= bridgestp -SRCS= bridgestp.c +SRCS= bridgestp.c opt_route.h .include <bsd.kmod.mk> diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile index 8cfe6db..e7f0523 100644 --- a/sys/modules/cxgb/iw_cxgb/Makefile +++ b/sys/modules/cxgb/iw_cxgb/Makefile @@ -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 diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile index dc40213..79a0081 100644 --- a/sys/modules/if_ef/Makefile +++ b/sys/modules/if_ef/Makefile @@ -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 diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile index 9842619..65ed060 100644 --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -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> diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile index 5b3330f..3ca0a3dc 100644 --- a/sys/modules/ip_mroute_mod/Makefile +++ b/sys/modules/ip_mroute_mod/Makefile @@ -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" diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index e208e1d..8e40d42 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -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 diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index 9b89c96..a7cb129 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -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 diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 82eb056..fbf5a58 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -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 diff --git a/sys/modules/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile index ebd94e1..fff3230b 100644 --- a/sys/modules/netgraph/atm/atm/Makefile +++ b/sys/modules/netgraph/atm/atm/Makefile @@ -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> diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile index 7a3950e..49f2bb6 100644 --- a/sys/modules/netgraph/ether/Makefile +++ b/sys/modules/netgraph/ether/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= ng_ether -SRCS= ng_ether.c +SRCS= ng_ether.c opt_route.h .include <bsd.kmod.mk> diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile index acf4373..121cfa9 100644 --- a/sys/modules/netgraph/gif/Makefile +++ b/sys/modules/netgraph/gif/Makefile @@ -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: diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index 1562a64..11742f5 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -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 diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index 3b07c41..3b53050 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -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 diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index 70533ba..edb2218 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -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: diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 99ad32e..7a75051 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -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> diff --git a/sys/net/if.c b/sys/net/if.c index 9cc6f83..59a5211 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -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> diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0a53265..8f07e6c 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -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> diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c index 59d4556..11e381e 100644 --- a/sys/net/if_ef.c +++ b/sys/net/if_ef.c @@ -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> diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d790d91..d26609c 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -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> diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c index 6fdb72b..c839748 100644 --- a/sys/net/if_faith.c +++ b/sys/net/if_faith.c @@ -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" diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 6b5e739..cfd249f 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -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 diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index ab5bda7..4b42527 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -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> diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c index 0902599..ae9088d 100644 --- a/sys/net/if_mib.c +++ b/sys/net/if_mib.c @@ -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 diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 51110c7..930ab4c 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -56,6 +56,7 @@ #ifdef INET #include <netinet/ip.h> #include <netinet/tcp.h> +#include <netinet/vinet.h> #endif #ifdef INET6 diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index d3c0d75..e3db9ae 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -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> diff --git a/sys/net/if_var.h b/sys/net/if_var.h index c6bcdf7..0724488 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -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_ */ diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 586fefd..ada6a72 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -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 diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index b2a04ca..1dedff8 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -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. diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index 633125a..79d3e30 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -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); diff --git a/sys/net/route.c b/sys/net/route.c index f97c077..a20faf3 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -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> diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 15c6928..7662c8d 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -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 diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index a319bd5..b3dd4d4 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -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> diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index 2beed32..e5e1e2e 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -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> diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index 1c952cd..3d92e5f 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -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> diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c index 9bcd374..d76e7e1 100644 --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -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> diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c index 22d085a..9a2d3b9 100644 --- a/sys/netgraph/ng_gif.c +++ b/sys/netgraph/ng_gif.c @@ -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> diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 82dc605..cf19a22 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -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> diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index f77434c..3dacdcd 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -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> diff --git a/sys/netinet/in.c b/sys/netinet/in.c index b57049f..9b6dd48 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -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); diff --git a/sys/netinet/in.h b/sys/netinet/in.h index b505a2e..b969bdf 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -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_*/ diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index f347102..9bcb09e 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -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> diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 6cf6d92..e7916dd 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -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 { diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index bb2eae0..35eb687 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -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 */ diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index adb4fee..aa4ca0d 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -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); diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index a7df9c8..0896949 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -347,8 +347,6 @@ do { \ } \ } while (/*CONSTCOND*/ 0) -#include <netinet6/vinet6.h> - #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index f93b895..b4212cc 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -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> diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index b74f5db..dc627a8 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -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> diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 7af1758..407b08c 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -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> diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index f7c5735..f9696cc 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -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> diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index e631dae..3666f5c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -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> diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index ed0a3e4..ce8c6b4 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -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, diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 7f12098..35ebf86 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -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 diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c index a4f8631..a1e082b 100644 --- a/sys/netinet/ip_ipsec.c +++ b/sys/netinet/ip_ipsec.c @@ -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> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index a241ec4..36a5efd 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -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> diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index 1cbe9f6..1a97c6f 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -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> diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 197ce9c..a40dd1d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -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> diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 71eaaa0..7871949 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -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> diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index bead1ae..64a4794 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -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> diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index ae89d59..7c76160 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -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 diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7b292d2..18a1bab 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -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> diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index 6419a95..fbaa05e 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -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; diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d93592b..2347305 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -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> diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 5f47be0..172abc5 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -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; diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 9eb57ba..b52b5b3 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -119,6 +119,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif /* TCPDEBUG */ +#include <netinet/vinet.h> #include <machine/in_cksum.h> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c7146c8..639c42f 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -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> diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 252fa1c..838fd52 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$"); #ifdef INET6 #include <netinet6/tcp6_var.h> #endif +#include <netinet/vinet.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 2e70719..acce92f 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -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, diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 7b06de4..37fafa0 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -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> diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 6428b64..2011dff 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -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. diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 2e52309..53e9626 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -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> diff --git a/sys/netinet/vinet.h b/sys/netinet/vinet.h index 5fdb1c0..8a8baba 100644 --- a/sys/netinet/vinet.h +++ b/sys/netinet/vinet.h @@ -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> diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 6ac30ed..f0045aa 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -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. diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 391ce92..5c4df75 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -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> diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4424481..59bc95a 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -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> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4834096..c784845 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -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"); diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index a0bdda8..ff0b8d1 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -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> diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 48579bc..7b5c2f9 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -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; diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6cf40ce..ad19bee 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -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> diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index f4fabf6..112cda2 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -128,6 +128,7 @@ __FBSDID("$FreeBSD$"); #endif /* IPSEC */ #include <netinet6/ip6protosw.h> +#include <netinet6/vinet6.h> /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index f628965..25e011a 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -89,6 +89,8 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> + #include <netinet/in.h> #include <netinet/ip_var.h> #include <netinet/in_var.h> @@ -98,6 +100,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp6.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #include <netinet/tcp.h> #include <netinet/tcp_seq.h> diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 481ad12..4d7723a 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -99,12 +99,15 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> +#include <netinet/vinet.h> + #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6_var.h> #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> static struct mtx addrsel_lock; #define ADDRSEL_LOCK_INIT() mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7571507..db0094c 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 320042f..fb42c5e 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -88,12 +88,14 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/netisr.h> #include <net/pfil.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #ifdef INET #include <netinet/ip.h> #include <netinet/ip_icmp.h> +#include <netinet/vinet.h> #endif /* INET */ #include <netinet/ip6.h> #include <netinet6/in6_var.h> @@ -103,6 +105,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 23f4e26..a6ac5c9 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_ipsec.h> #include <netinet6/ip6_var.h> +#include <netinet6/vinet6.h> extern struct protosw inet6sw[]; diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 2ae6ed8..9b85a16 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -107,10 +107,12 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/raw_cb.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/icmp6.h> +#include <netinet/vinet.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> @@ -120,6 +122,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6protosw.h> #include <netinet6/pim6.h> #include <netinet6/pim6_var.h> +#include <netinet6/vinet6.h> static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry"); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index fb7162f..6e5d0d0 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include <net/netisr.h> #include <net/route.h> #include <net/pfil.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -94,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in_pcb.h> #include <netinet/tcp_var.h> #include <netinet6/nd6.h> +#include <netinet/vinet.h> #ifdef IPSEC #include <netipsec/ipsec.h> @@ -104,6 +106,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6protosw.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> static MALLOC_DEFINE(M_IP6MOPTS, "ip6_moptions", "internet multicast options"); diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 9c6bbdb..3e0f921 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> #include <netinet6/mld6_var.h> +#include <netinet6/vinet6.h> /* * Protocol constants diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index dfe0016..8f517a5 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include <net/iso88025.h> #include <net/fddi.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/if_ether.h> @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #include <sys/limits.h> #include <sys/vimage.h> diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index ef898cd..ecfad0e 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #ifdef DEV_CARP #include <netinet/ip_carp.h> diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 200f1f4..5e52a85 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/route.h> #include <net/radix.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet6/in6_var.h> @@ -62,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #include <netinet/icmp6.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #define SDL(s) ((struct sockaddr_dl *)s) diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 4537f7d..b132751 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -84,12 +84,15 @@ __FBSDID("$FreeBSD$"); #include <net/if.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/in_systm.h> -#include <netinet/icmp6.h> #include <netinet/in_pcb.h> +#include <netinet/vinet.h> + +#include <netinet/icmp6.h> #include <netinet/ip6.h> #include <netinet6/ip6protosw.h> #include <netinet6/ip6_mroute.h> @@ -98,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #include <netinet6/raw_ip6.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c index dd1ec68..2bff4af 100644 --- a/sys/netinet6/route6.c +++ b/sys/netinet6/route6.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #if 0 static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 4bb84d9..3dde09a 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/if.h> +#include <net/vnet.h> #include <netinet/in.h> -#include <netinet/ip6.h> +#include <netinet/ip6.h> #include <netinet6/in6_var.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> /* diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 6d233dd..cfb0ad6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -103,11 +103,14 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> +#include <netinet/vinet.h> + #include <netinet6/ip6protosw.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> #include <netinet6/udp6_var.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index cc8269c..a84be4f 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -33,17 +33,19 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ -#include <sys/socket.h> -#include <netinet/ip6.h> -#include <net/if.h> +#include <sys/callout.h> +#include <sys/queue.h> +#include <sys/types.h> + +#include <net/if_var.h> + +#include <netinet/icmp6.h> +#include <netinet/in.h> + #include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #include <netinet6/raw_ip6.h> -#include <netinet/icmp6.h> #include <netinet6/scope6_var.h> -#include <netinet6/in6_ifattach.h> -#include <netinet6/in6_var.h> -#include <netinet6/nd6.h> -#include <netinet/in_pcb.h> struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 0c37aef..018e0c5 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -74,6 +74,7 @@ #include <netinet/in_pcb.h> #ifdef INET6 #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #endif #include <netipsec/ipsec.h> diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 7b79294..5728427 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -65,6 +65,7 @@ #include <netinet/in_pcb.h> #ifdef INET6 #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #endif #include <netipsec/ipsec.h> diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 3e2b4e0..f65d1f1 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -75,9 +75,11 @@ #ifdef INET #include <netinet/in_pcb.h> +#include <netinet/vinet.h> #endif #ifdef INET6 #include <netinet6/in6_pcb.h> +#include <netinet6/vinet6.h> #endif /* INET6 */ #include <net/pfkeyv2.h> diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 6842b5f..5fb7fd5 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -55,6 +55,7 @@ #include <net/if.h> #include <net/raw_cb.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> diff --git a/sys/netipsec/vipsec.h b/sys/netipsec/vipsec.h index 32818b9..de97452 100644 --- a/sys/netipsec/vipsec.h +++ b/sys/netipsec/vipsec.h @@ -33,21 +33,18 @@ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ -#include <sys/proc.h> #include <sys/protosw.h> -#include <sys/socket.h> -#include <netipsec/ipsec.h> -#include <netipsec/esp_var.h> +#include <net/pfkeyv2.h> +#include <net/raw_cb.h> + +#include <netinet/ipprotosw.h> + #include <netipsec/ah_var.h> +#include <netipsec/esp_var.h> #include <netipsec/ipcomp_var.h> #include <netipsec/ipip_var.h> - -#include <net/if.h> -#include <net/if_var.h> -#include <net/route.h> -#include <net/raw_cb.h> - +#include <netipsec/ipsec.h> #include <netipsec/keysock.h> struct vnet_ipsec { diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c index 610f984..a9492dc 100644 --- a/sys/netipsec/xform_ipip.c +++ b/sys/netipsec/xform_ipip.c @@ -56,6 +56,7 @@ #include <net/pfil.h> #include <net/route.h> #include <net/netisr.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -64,16 +65,16 @@ #include <netinet/ip_ecn.h> #include <netinet/ip_var.h> #include <netinet/ip_encap.h> +#ifdef MROUTING +#include <netinet/ip_mroute.h> +#endif +#include <netinet/vinet.h> #include <netipsec/ipsec.h> #include <netipsec/xform.h> #include <netipsec/ipip_var.h> -#ifdef MROUTING -#include <netinet/ip_mroute.h> -#endif - #ifdef INET6 #include <netinet/ip6.h> #include <netipsec/ipsec6.h> diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index 1274da0..6f1014d 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <net/if_types.h> #include <net/if_dl.h> +#include <net/vnet.h> #include <rpc/rpcclnt.h> diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c index 7362aa9..0259790 100644 --- a/sys/nfsclient/nfs_diskless.c +++ b/sys/nfsclient/nfs_diskless.c @@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/if_var.h> #include <net/ethernet.h> +#include <net/vnet.h> + #include <netinet/in.h> #include <rpc/rpcclnt.h> #include <nfs/rpcv2.h> diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index b019af0..7399470 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> +#include <netinet/vinet.h> /* Defs */ #define TRUE 1 |
