diff options
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 1 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 3 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/mlfk_ipl.c | 2 | ||||
-rw-r--r-- | sys/contrib/pf/net/pf.c | 4 | ||||
-rw-r--r-- | sys/contrib/pf/net/pf_if.c | 5 | ||||
-rw-r--r-- | sys/contrib/pf/net/pf_ioctl.c | 3 | ||||
-rw-r--r-- | sys/contrib/pf/net/pf_subr.c | 1 | ||||
-rw-r--r-- | sys/contrib/rdma/rdma_cma.c | 1 |
8 files changed, 18 insertions, 2 deletions
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> |