Date: Tue, 2 Dec 2008 21:37:28 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185571 - in head/sys: compat/linprocfs compat/linux compat/svr4 contrib/altq/altq contrib/ipfilter/netinet contrib/pf/net contrib/rdma dev/cxgb/ulp/iw_cxgb dev/cxgb/ulp/tom kern module... Message-ID: <200812022137.mB2LbSDN072024@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Tue Dec 2 21:37:28 2008 New Revision: 185571 URL: http://svn.freebsd.org/changeset/base/185571 Log: Rather than using hidden includes (with cicular dependencies), 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 Modified: head/sys/compat/linprocfs/linprocfs.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_socket.c head/sys/compat/svr4/svr4_sockio.c head/sys/contrib/altq/altq/altq_subr.c head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c head/sys/contrib/ipfilter/netinet/mlfk_ipl.c head/sys/contrib/pf/net/pf.c head/sys/contrib/pf/net/pf_if.c head/sys/contrib/pf/net/pf_ioctl.c head/sys/contrib/pf/net/pf_subr.c head/sys/contrib/rdma/rdma_cma.c head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c head/sys/kern/kern_poll.c head/sys/kern/kern_uuid.c head/sys/modules/ae/Makefile head/sys/modules/ath/Makefile head/sys/modules/ath_rate_amrr/Makefile head/sys/modules/ath_rate_onoe/Makefile head/sys/modules/ath_rate_sample/Makefile head/sys/modules/bridgestp/Makefile head/sys/modules/cxgb/iw_cxgb/Makefile head/sys/modules/if_ef/Makefile head/sys/modules/if_vlan/Makefile head/sys/modules/ip_mroute_mod/Makefile head/sys/modules/ipfw/Makefile head/sys/modules/linprocfs/Makefile head/sys/modules/linux/Makefile head/sys/modules/netgraph/atm/atm/Makefile head/sys/modules/netgraph/ether/Makefile head/sys/modules/netgraph/gif/Makefile head/sys/modules/nfsclient/Makefile head/sys/modules/pf/Makefile head/sys/modules/wlan/Makefile head/sys/net/bridgestp.c head/sys/net/if.c head/sys/net/if_bridge.c head/sys/net/if_ef.c head/sys/net/if_ethersubr.c head/sys/net/if_faith.c head/sys/net/if_gre.c head/sys/net/if_loop.c head/sys/net/if_mib.c head/sys/net/if_spppsubr.c head/sys/net/if_stf.c head/sys/net/if_var.h head/sys/net/if_vlan.c head/sys/net/raw_cb.c head/sys/net/raw_usrreq.c head/sys/net/route.c head/sys/net/rtsock.c head/sys/net80211/ieee80211_ddb.c head/sys/netgraph/atm/ng_atm.c head/sys/netgraph/ng_eiface.c head/sys/netgraph/ng_ether.c head/sys/netgraph/ng_gif.c head/sys/netinet/if_ether.c head/sys/netinet/igmp.c head/sys/netinet/in.c head/sys/netinet/in.h head/sys/netinet/in_gif.c head/sys/netinet/in_mcast.c head/sys/netinet/in_pcb.c head/sys/netinet/in_rmx.c head/sys/netinet/ip6.h head/sys/netinet/ip_carp.c head/sys/netinet/ip_divert.c head/sys/netinet/ip_fastfwd.c head/sys/netinet/ip_fw2.c head/sys/netinet/ip_icmp.c head/sys/netinet/ip_id.c head/sys/netinet/ip_input.c head/sys/netinet/ip_ipsec.c head/sys/netinet/ip_mroute.c head/sys/netinet/ip_options.c head/sys/netinet/ip_output.c head/sys/netinet/raw_ip.c head/sys/netinet/sctp_os_bsd.h head/sys/netinet/tcp_hostcache.c head/sys/netinet/tcp_input.c head/sys/netinet/tcp_offload.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_reass.c head/sys/netinet/tcp_sack.c head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.c head/sys/netinet/tcp_timer.c head/sys/netinet/tcp_timewait.c head/sys/netinet/tcp_usrreq.c head/sys/netinet/udp_usrreq.c head/sys/netinet/vinet.h head/sys/netinet6/dest6.c head/sys/netinet6/frag6.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6.c head/sys/netinet6/in6_gif.c head/sys/netinet6/in6_ifattach.c head/sys/netinet6/in6_pcb.c head/sys/netinet6/in6_proto.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/in6_src.c head/sys/netinet6/ip6_forward.c head/sys/netinet6/ip6_input.c head/sys/netinet6/ip6_ipsec.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/ip6_output.c head/sys/netinet6/mld6.c head/sys/netinet6/nd6.c head/sys/netinet6/nd6_nbr.c head/sys/netinet6/nd6_rtr.c head/sys/netinet6/raw_ip6.c head/sys/netinet6/route6.c head/sys/netinet6/scope6.c head/sys/netinet6/udp6_usrreq.c head/sys/netinet6/vinet6.h head/sys/netipsec/ipsec_input.c head/sys/netipsec/ipsec_output.c head/sys/netipsec/key.c head/sys/netipsec/keysock.c head/sys/netipsec/vipsec.h head/sys/netipsec/xform_ipip.c head/sys/nfsclient/bootp_subr.c head/sys/nfsclient/nfs_diskless.c head/sys/nfsclient/nfs_vnops.c Modified: head/sys/compat/linprocfs/linprocfs.c ============================================================================== --- head/sys/compat/linprocfs/linprocfs.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/compat/linprocfs/linprocfs.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/compat/linux/linux_ioctl.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/compat/linux/linux_socket.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/compat/svr4/svr4_sockio.c ============================================================================== --- head/sys/compat/svr4/svr4_sockio.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/compat/svr4/svr4_sockio.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/contrib/altq/altq/altq_subr.c ============================================================================== --- head/sys/contrib/altq/altq/altq_subr.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/altq/altq/altq_subr.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Dec 2 21:37:28 2008 (r185571) @@ -112,6 +112,9 @@ static const char rcsid[] = "@(#)$Id: ip #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 Modified: head/sys/contrib/ipfilter/netinet/mlfk_ipl.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/mlfk_ipl.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/ipfilter/netinet/mlfk_ipl.c Tue Dec 2 21:37:28 2008 (r185571) @@ -43,9 +43,7 @@ static int sysctl_ipf_int ( SYSCTL_HANDL 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); Modified: head/sys/contrib/pf/net/pf.c ============================================================================== --- head/sys/contrib/pf/net/pf.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/pf/net/pf.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 */ Modified: head/sys/contrib/pf/net/pf_if.c ============================================================================== --- head/sys/contrib/pf/net/pf_if.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/pf/net/pf_if.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- head/sys/contrib/pf/net/pf_ioctl.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/pf/net/pf_ioctl.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/contrib/pf/net/pf_subr.c ============================================================================== --- head/sys/contrib/pf/net/pf_subr.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/pf/net/pf_subr.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> /* Modified: head/sys/contrib/rdma/rdma_cma.c ============================================================================== --- head/sys/contrib/rdma/rdma_cma.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/contrib/rdma/rdma_cma.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c ============================================================================== --- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c ============================================================================== --- head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/kern/kern_poll.c ============================================================================== --- head/sys/kern/kern_poll.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/kern/kern_poll.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/kern/kern_uuid.c ============================================================================== --- head/sys/kern/kern_uuid.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/kern/kern_uuid.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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: Modified: head/sys/modules/ae/Makefile ============================================================================== --- head/sys/modules/ae/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ae/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/modules/ath/Makefile ============================================================================== --- head/sys/modules/ath/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ath/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/ath_rate_amrr/Makefile ============================================================================== --- head/sys/modules/ath_rate_amrr/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ath_rate_amrr/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/ath_rate_onoe/Makefile ============================================================================== --- head/sys/modules/ath_rate_onoe/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ath_rate_onoe/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/ath_rate_sample/Makefile ============================================================================== --- head/sys/modules/ath_rate_sample/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ath_rate_sample/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/bridgestp/Makefile ============================================================================== --- head/sys/modules/bridgestp/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/bridgestp/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../net KMOD= bridgestp -SRCS= bridgestp.c +SRCS= bridgestp.c opt_route.h .include <bsd.kmod.mk> Modified: head/sys/modules/cxgb/iw_cxgb/Makefile ============================================================================== --- head/sys/modules/cxgb/iw_cxgb/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/cxgb/iw_cxgb/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/if_ef/Makefile ============================================================================== --- head/sys/modules/if_ef/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/if_ef/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/if_vlan/Makefile ============================================================================== --- head/sys/modules/if_vlan/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/if_vlan/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/modules/ip_mroute_mod/Makefile ============================================================================== --- head/sys/modules/ip_mroute_mod/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ip_mroute_mod/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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" Modified: head/sys/modules/ipfw/Makefile ============================================================================== --- head/sys/modules/ipfw/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/ipfw/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/linprocfs/Makefile ============================================================================== --- head/sys/modules/linprocfs/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/linprocfs/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/linux/Makefile ============================================================================== --- head/sys/modules/linux/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/linux/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -13,7 +13,7 @@ SRCS= linux${SFX}_dummy.c linux_emul.c l linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \ - opt_inet6.h opt_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 Modified: head/sys/modules/netgraph/atm/atm/Makefile ============================================================================== --- head/sys/modules/netgraph/atm/atm/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/netgraph/atm/atm/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/modules/netgraph/ether/Makefile ============================================================================== --- head/sys/modules/netgraph/ether/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/netgraph/ether/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= ng_ether -SRCS= ng_ether.c +SRCS= ng_ether.c opt_route.h .include <bsd.kmod.mk> Modified: head/sys/modules/netgraph/gif/Makefile ============================================================================== --- head/sys/modules/netgraph/gif/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/netgraph/gif/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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: Modified: head/sys/modules/nfsclient/Makefile ============================================================================== --- head/sys/modules/nfsclient/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/nfsclient/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/pf/Makefile ============================================================================== --- head/sys/modules/pf/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/pf/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/modules/wlan/Makefile ============================================================================== --- head/sys/modules/wlan/Makefile Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/modules/wlan/Makefile Tue Dec 2 21:37:28 2008 (r185571) @@ -10,7 +10,8 @@ SRCS= ieee80211.c ieee80211_crypto.c iee 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: Modified: head/sys/net/bridgestp.c ============================================================================== --- head/sys/net/bridgestp.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/bridgestp.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_bridge.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_ef.c ============================================================================== --- head/sys/net/if_ef.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_ef.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_ethersubr.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_faith.c ============================================================================== --- head/sys/net/if_faith.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_faith.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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" Modified: head/sys/net/if_gre.c ============================================================================== --- head/sys/net/if_gre.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_gre.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/net/if_loop.c ============================================================================== --- head/sys/net/if_loop.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_loop.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_mib.c ============================================================================== --- head/sys/net/if_mib.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_mib.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/net/if_spppsubr.c ============================================================================== --- head/sys/net/if_spppsubr.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_spppsubr.c Tue Dec 2 21:37:28 2008 (r185571) @@ -56,6 +56,7 @@ #ifdef INET #include <netinet/ip.h> #include <netinet/tcp.h> +#include <netinet/vinet.h> #endif #ifdef INET6 Modified: head/sys/net/if_stf.c ============================================================================== --- head/sys/net/if_stf.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_stf.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/if_var.h ============================================================================== --- head/sys/net/if_var.h Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_var.h Tue Dec 2 21:37:28 2008 (r185571) @@ -720,8 +720,6 @@ int ether_poll_register(poll_handler_ int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ -#include <net/vnet.h> - #endif /* _KERNEL */ #endif /* !_NET_IF_VAR_H_ */ Modified: head/sys/net/if_vlan.c ============================================================================== --- head/sys/net/if_vlan.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/if_vlan.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/net/raw_cb.c ============================================================================== --- head/sys/net/raw_cb.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/raw_cb.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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. Modified: head/sys/net/raw_usrreq.c ============================================================================== --- head/sys/net/raw_usrreq.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/raw_usrreq.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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); Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/route.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/net/rtsock.c ============================================================================== --- head/sys/net/rtsock.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net/rtsock.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/net80211/ieee80211_ddb.c ============================================================================== --- head/sys/net80211/ieee80211_ddb.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/net80211/ieee80211_ddb.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netgraph/atm/ng_atm.c ============================================================================== --- head/sys/netgraph/atm/ng_atm.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netgraph/atm/ng_atm.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netgraph/ng_eiface.c ============================================================================== --- head/sys/netgraph/ng_eiface.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netgraph/ng_eiface.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netgraph/ng_ether.c ============================================================================== --- head/sys/netgraph/ng_ether.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netgraph/ng_ether.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netgraph/ng_gif.c ============================================================================== --- head/sys/netgraph/ng_gif.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netgraph/ng_gif.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/if_ether.c ============================================================================== --- head/sys/netinet/if_ether.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/if_ether.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/igmp.c ============================================================================== --- head/sys/netinet/igmp.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/igmp.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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); Modified: head/sys/netinet/in.h ============================================================================== --- head/sys/netinet/in.h Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in.h Tue Dec 2 21:37:28 2008 (r185571) @@ -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_*/ Modified: head/sys/netinet/in_gif.c ============================================================================== --- head/sys/netinet/in_gif.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in_gif.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/in_mcast.c ============================================================================== --- head/sys/netinet/in_mcast.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in_mcast.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 { Modified: head/sys/netinet/in_pcb.c ============================================================================== --- head/sys/netinet/in_pcb.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in_pcb.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 */ Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/in_rmx.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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); Modified: head/sys/netinet/ip6.h ============================================================================== --- head/sys/netinet/ip6.h Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip6.h Tue Dec 2 21:37:28 2008 (r185571) @@ -347,8 +347,6 @@ do { \ } \ } while (/*CONSTCOND*/ 0) -#include <netinet6/vinet6.h> - #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ Modified: head/sys/netinet/ip_carp.c ============================================================================== --- head/sys/netinet/ip_carp.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_carp.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_divert.c ============================================================================== --- head/sys/netinet/ip_divert.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_divert.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_fastfwd.c ============================================================================== --- head/sys/netinet/ip_fastfwd.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_fastfwd.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_fw2.c ============================================================================== --- head/sys/netinet/ip_fw2.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_fw2.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_icmp.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_id.c ============================================================================== --- head/sys/netinet/ip_id.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_id.c Tue Dec 2 21:37:28 2008 (r185571) @@ -104,6 +104,7 @@ static int sysctl_ip_id_change(SYSCTL_HA 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, Modified: head/sys/netinet/ip_input.c ============================================================================== --- head/sys/netinet/ip_input.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_input.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/netinet/ip_ipsec.c ============================================================================== --- head/sys/netinet/ip_ipsec.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_ipsec.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_mroute.c ============================================================================== --- head/sys/netinet/ip_mroute.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_mroute.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_options.c ============================================================================== --- head/sys/netinet/ip_options.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_options.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/ip_output.c ============================================================================== --- head/sys/netinet/ip_output.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/ip_output.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/raw_ip.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/sctp_os_bsd.h ============================================================================== --- head/sys/netinet/sctp_os_bsd.h Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/sctp_os_bsd.h Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/tcp_hostcache.c ============================================================================== --- head/sys/netinet/tcp_hostcache.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/tcp_hostcache.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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 Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/tcp_input.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/tcp_offload.c ============================================================================== --- head/sys/netinet/tcp_offload.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/tcp_offload.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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; Modified: head/sys/netinet/tcp_output.c ============================================================================== --- head/sys/netinet/tcp_output.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/tcp_output.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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> Modified: head/sys/netinet/tcp_reass.c ============================================================================== --- head/sys/netinet/tcp_reass.c Tue Dec 2 20:50:37 2008 (r185570) +++ head/sys/netinet/tcp_reass.c Tue Dec 2 21:37:28 2008 (r185571) @@ -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; Modified: head/sys/netinet/tcp_sack.c ============================================================================== --- head/sys/netinet/tcp_sack.c Tue Dec 2 20:50:37 2008 (r185570) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812022137.mB2LbSDN072024>