aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2013-10-27 16:25:57 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2013-10-27 16:25:57 +0000
commit75bf2db38065cafe6b1716e5e66a00962866d5bf (patch)
treed018d2359cd89430bc204964f04874d868cfdd89 /sys/contrib
parentc2a445910d15c856f068b5b8f3f58c3ecd99a3df (diff)
downloadsrc-75bf2db38065cafe6b1716e5e66a00962866d5bf.tar.gz
src-75bf2db38065cafe6b1716e5e66a00962866d5bf.zip
Move new pf includes to the pf directory. The pfvar.h remain
in net, to avoid compatibility breakage for no sake. The future plan is to split most of non-kernel parts of pfvar.h into pf.h, and then make pfvar.h a kernel only include breaking compatibility. Discussed with: bz
Notes
Notes: svn path=/head/; revision=257215
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/altq/altq/altq_cbq.c6
-rw-r--r--sys/contrib/altq/altq/altq_hfsc.c6
-rw-r--r--sys/contrib/altq/altq/altq_priq.c6
-rw-r--r--sys/contrib/altq/altq/altq_red.c6
-rw-r--r--sys/contrib/altq/altq/altq_rio.c4
-rw-r--r--sys/contrib/altq/altq/altq_subr.c4
6 files changed, 16 insertions, 16 deletions
diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c
index 9f8f9ec6e0e9..3991d1d927c8 100644
--- a/sys/contrib/altq/altq/altq_cbq.c
+++ b/sys/contrib/altq/altq/altq_cbq.c
@@ -57,9 +57,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
-#include <net/pf.h>
-#include <net/pf_altq.h>
-#include <net/pf_mtag.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_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c
index e525aad9e4f8..03630167fc60 100644
--- a/sys/contrib/altq/altq/altq_hfsc.c
+++ b/sys/contrib/altq/altq/altq_hfsc.c
@@ -69,9 +69,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
-#include <net/pf.h>
-#include <net/pf_altq.h>
-#include <net/pf_mtag.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 fd70bde71596..3ce65dc15e15 100644
--- a/sys/contrib/altq/altq/altq_priq.c
+++ b/sys/contrib/altq/altq/altq_priq.c
@@ -54,9 +54,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
-#include <net/pf.h>
-#include <net/pf_altq.h>
-#include <net/pf_mtag.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 5199566f1b31..defee2923d4e 100644
--- a/sys/contrib/altq/altq/altq_red.c
+++ b/sys/contrib/altq/altq/altq_red.c
@@ -95,9 +95,9 @@
#include <netinet/ip6.h>
#endif
-#include <net/pf.h>
-#include <net/pf_altq.h>
-#include <net/pf_mtag.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 c508fdc5768e..151debed4518 100644
--- a/sys/contrib/altq/altq/altq_rio.c
+++ b/sys/contrib/altq/altq/altq_rio.c
@@ -90,8 +90,8 @@
#include <netinet/ip6.h>
#endif
-#include <net/pf.h>
-#include <net/pf_altq.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_subr.c b/sys/contrib/altq/altq/altq_subr.c
index 2e1e68f72a4a..16b796a1e52a 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -65,8 +65,8 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#include <net/pf.h>
-#include <net/pf_altq.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
#include <altq/altq.h>
#ifdef ALTQ3_COMPAT
#include <altq/altq_conf.h>