summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-09-12 21:09:56 +0000
committerjhb <jhb@FreeBSD.org>2011-09-12 21:09:56 +0000
commitebd93e5aff0f6d81473632a976e39d5d4cb26f8b (patch)
tree94df02713a2a8e874f5e086a1b1cdf710b21043c /sys/netinet
parentf6a3e0b0cfcf31775d8737c05d9b149d92a12142 (diff)
downloadFreeBSD-src-ebd93e5aff0f6d81473632a976e39d5d4cb26f8b.zip
FreeBSD-src-ebd93e5aff0f6d81473632a976e39d5d4cb26f8b.tar.gz
Allow the ipfw.ko module built with a kernel to honor any IPFIREWALL_*
options defined in the kernel config. This more closely matches the behavior of other modules which inherit configuration settings from the kernel configuration during a kernel + modules build. Reviewed by: luigi Approved by: re (kib) MFC after: 1 week
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ipfw/ip_fw2.c2
-rw-r--r--sys/netinet/ipfw/ip_fw_dynamic.c2
-rw-r--r--sys/netinet/ipfw/ip_fw_log.c2
-rw-r--r--sys/netinet/ipfw/ip_fw_pfil.c2
-rw-r--r--sys/netinet/ipfw/ip_fw_sockopt.c2
-rw-r--r--sys/netinet/ipfw/ip_fw_table.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c
index c3123df..619ce6b 100644
--- a/sys/netinet/ipfw/ip_fw2.c
+++ b/sys/netinet/ipfw/ip_fw2.c
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* The FreeBSD IP packet firewall, main file
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
diff --git a/sys/netinet/ipfw/ip_fw_dynamic.c b/sys/netinet/ipfw/ip_fw_dynamic.c
index 0bc4cc1..d1eec89 100644
--- a/sys/netinet/ipfw/ip_fw_dynamic.c
+++ b/sys/netinet/ipfw/ip_fw_dynamic.c
@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* Dynamic rule support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
diff --git a/sys/netinet/ipfw/ip_fw_log.c b/sys/netinet/ipfw/ip_fw_log.c
index 6454813..2f6e8b6 100644
--- a/sys/netinet/ipfw/ip_fw_log.c
+++ b/sys/netinet/ipfw/ip_fw_log.c
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* Logging support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c
index 2aaa845..c470b1f 100644
--- a/sys/netinet/ipfw/ip_fw_pfil.c
+++ b/sys/netinet/ipfw/ip_fw_pfil.c
@@ -27,8 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET
diff --git a/sys/netinet/ipfw/ip_fw_sockopt.c b/sys/netinet/ipfw/ip_fw_sockopt.c
index 375b9c5..610570b 100644
--- a/sys/netinet/ipfw/ip_fw_sockopt.c
+++ b/sys/netinet/ipfw/ip_fw_sockopt.c
@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* the upper half of the ipfw code.
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
diff --git a/sys/netinet/ipfw/ip_fw_table.c b/sys/netinet/ipfw/ip_fw_table.c
index 517622f..f724017 100644
--- a/sys/netinet/ipfw/ip_fw_table.c
+++ b/sys/netinet/ipfw/ip_fw_table.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
* from userland, because operations are typically fast.
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
OpenPOWER on IntegriCloud