aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/conf/files8
-rw-r--r--sys/modules/dummynet/Makefile2
-rw-r--r--sys/modules/ipfw/Makefile2
-rw-r--r--sys/modules/ipfw_nat/Makefile2
-rw-r--r--sys/netinet/ipfw/ip_dummynet.c (renamed from sys/netinet/ip_dummynet.c)0
-rw-r--r--sys/netinet/ipfw/ip_fw2.c (renamed from sys/netinet/ip_fw2.c)0
-rw-r--r--sys/netinet/ipfw/ip_fw_nat.c (renamed from sys/netinet/ip_fw_nat.c)0
-rw-r--r--sys/netinet/ipfw/ip_fw_pfil.c (renamed from sys/netinet/ip_fw_pfil.c)0
8 files changed, 7 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 903a95708893..b47ee0d064fa 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2334,14 +2334,14 @@ netinet/in_proto.c optional inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/in_rmx.c optional inet
netinet/ip_divert.c optional ipdivert
-netinet/ip_dummynet.c optional dummynet
+netinet/ipfw/ip_dummynet.c optional dummynet
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
-netinet/ip_fw2.c optional ipfirewall \
+netinet/ipfw/ip_fw2.c optional ipfirewall \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-netinet/ip_fw_pfil.c optional ipfirewall
-netinet/ip_fw_nat.c optional ipfirewall_nat
+netinet/ipfw/ip_fw_pfil.c optional ipfirewall
+netinet/ipfw/ip_fw_nat.c optional ipfirewall_nat
netinet/ip_icmp.c optional inet
netinet/ip_input.c optional inet
netinet/ip_ipsec.c optional ipsec
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 5da69b271f54..c25a7a7b0f4a 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet/ipfw
KMOD= dummynet
SRCS= ip_dummynet.c
SRCS+= opt_inet6.h
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 8e40d4291fc6..bc1bd08e58db 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet/ipfw
KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile
index 8d51124c4ec2..1c957abe9f70 100644
--- a/sys/modules/ipfw_nat/Makefile
+++ b/sys/modules/ipfw_nat/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../netinet/ipfw
KMOD= ipfw_nat
SRCS= ip_fw_nat.c
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ipfw/ip_dummynet.c
index 2f11ae08a579..2f11ae08a579 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ipfw/ip_dummynet.c
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c
index 760150a4ddb9..760150a4ddb9 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ipfw/ip_fw2.c
diff --git a/sys/netinet/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c
index cce50863c31d..cce50863c31d 100644
--- a/sys/netinet/ip_fw_nat.c
+++ b/sys/netinet/ipfw/ip_fw_nat.c
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c
index 0b1ba2daafb4..0b1ba2daafb4 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ipfw/ip_fw_pfil.c