diff options
author | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
commit | f937dcf2bd0584087acec5d8dc92dd5dba177113 (patch) | |
tree | 8cbef21f45f26a80647ff8a0604c3c9c65c2bb40 /sys/contrib | |
parent | eeff801556700aefbd569ad4bac5acdebcc3b9a8 (diff) | |
download | FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.zip FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.tar.gz |
Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.
Merge r257186,257215,257349,259736,261797.
These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/altq/altq/altq_cbq.c | 5 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_cdnr.c | 1 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_hfsc.c | 5 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_priq.c | 5 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_red.c | 5 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_rio.c | 4 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_rmclass.c | 2 | ||||
-rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 4 |
8 files changed, 25 insertions, 6 deletions
diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c index 0a33792..3991d1d 100644 --- a/sys/contrib/altq/altq/altq_cbq.c +++ b/sys/contrib/altq/altq/altq_cbq.c @@ -54,9 +54,12 @@ #endif #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> +#include <netpfil/pf/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_cbq.h> #ifdef ALTQ3_COMPAT diff --git a/sys/contrib/altq/altq/altq_cdnr.c b/sys/contrib/altq/altq/altq_cdnr.c index fca7041..ee36fe8 100644 --- a/sys/contrib/altq/altq/altq_cdnr.c +++ b/sys/contrib/altq/altq/altq_cdnr.c @@ -55,6 +55,7 @@ #include <netinet/ip6.h> #endif +#include <altq/if_altq.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c index f436bd5..0363016 100644 --- a/sys/contrib/altq/altq/altq_hfsc.c +++ b/sys/contrib/altq/altq/altq_hfsc.c @@ -66,9 +66,12 @@ #endif /* ALTQ3_COMPAT */ #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> +#include <netpfil/pf/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_hfsc.h> #ifdef ALTQ3_COMPAT diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/contrib/altq/altq/altq_priq.c index 72bad80..3ce65dc 100644 --- a/sys/contrib/altq/altq/altq_priq.c +++ b/sys/contrib/altq/altq/altq_priq.c @@ -51,9 +51,12 @@ #include <sys/queue.h> #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> +#include <netpfil/pf/pf_mtag.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> diff --git a/sys/contrib/altq/altq/altq_red.c b/sys/contrib/altq/altq/altq_red.c index b92e005..defee29 100644 --- a/sys/contrib/altq/altq/altq_red.c +++ b/sys/contrib/altq/altq/altq_red.c @@ -86,6 +86,7 @@ #endif /* ALTQ3_COMPAT */ #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -94,7 +95,9 @@ #include <netinet/ip6.h> #endif -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> +#include <netpfil/pf/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_red.h> #ifdef ALTQ3_COMPAT diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/contrib/altq/altq/altq_rio.c index a48cd6d..151debe 100644 --- a/sys/contrib/altq/altq/altq_rio.c +++ b/sys/contrib/altq/altq/altq_rio.c @@ -81,6 +81,7 @@ #endif #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -89,7 +90,8 @@ #include <netinet/ip6.h> #endif -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> #include <altq/altq.h> #include <altq/altq_cdnr.h> #include <altq/altq_red.h> diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/contrib/altq/altq/altq_rmclass.c index 83a8720..c433024 100644 --- a/sys/contrib/altq/altq/altq_rmclass.c +++ b/sys/contrib/altq/altq/altq_rmclass.c @@ -59,12 +59,14 @@ #endif #include <net/if.h> +#include <net/if_var.h> #ifdef ALTQ3_COMPAT #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #endif +#include <altq/if_altq.h> #include <altq/altq.h> #include <altq/altq_rmclass.h> #include <altq/altq_rmclass_debug.h> diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 2d7ce75..16b796a 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -49,6 +49,7 @@ #include <sys/queue.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> #ifdef __FreeBSD__ @@ -64,7 +65,8 @@ #include <netinet/tcp.h> #include <netinet/udp.h> -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> +#include <netpfil/pf/pf_altq.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> |