summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bpf.c1
-rw-r--r--sys/net/if.c1
-rw-r--r--sys/net/if_atmsubr.c1
-rw-r--r--sys/net/if_bridge.c4
-rw-r--r--sys/net/if_ethersubr.c7
-rw-r--r--sys/net/if_fddisubr.c1
-rw-r--r--sys/net/if_fwsubr.c1
-rw-r--r--sys/net/if_gif.c1
-rw-r--r--sys/net/if_iso88025subr.c1
-rw-r--r--sys/net/if_loop.c1
-rw-r--r--sys/net/if_stf.c1
-rw-r--r--sys/net/if_tun.c1
12 files changed, 5 insertions, 16 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index b944e29..c74d09f 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -38,7 +38,6 @@
__FBSDID("$FreeBSD$");
#include "opt_bpf.h"
-#include "opt_mac.h"
#include "opt_netgraph.h"
#include <sys/types.h>
diff --git a/sys/net/if.c b/sys/net/if.c
index ffff619..1a5dcd2 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -34,7 +34,6 @@
#include "opt_inet6.h"
#include "opt_inet.h"
#include "opt_route.h"
-#include "opt_mac.h"
#include "opt_carp.h"
#include <sys/param.h>
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 734acc5..d8a3313 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_mac.h"
#include "opt_natm.h"
#include <sys/param.h>
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 276588b..f4551d1 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -3039,7 +3039,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
goto bad;
}
- if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
+ if (ip_fw_chk_ptr && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
INIT_VNET_INET(curvnet);
error = -1;
@@ -3058,7 +3058,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
if (*mp == NULL)
return (error);
- if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) {
+ if (ip_dn_io_ptr && (i == IP_FW_DUMMYNET)) {
/* put the Ethernet header back on */
M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 44f6b23..02ff422 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -35,7 +35,6 @@
#include "opt_inet6.h"
#include "opt_ipx.h"
#include "opt_route.h"
-#include "opt_mac.h"
#include "opt_netgraph.h"
#include "opt_carp.h"
#include "opt_mbuf_profiling.h"
@@ -432,7 +431,7 @@ ether_output_frame(struct ifnet *ifp, struct mbuf *m)
INIT_VNET_NET(ifp->if_vnet);
struct ip_fw *rule = ip_dn_claim_rule(m);
- if (IPFW_LOADED && V_ether_ipfw != 0) {
+ if (ip_fw_chk_ptr && V_ether_ipfw != 0) {
if (ether_ipfw_chk(&m, ifp, &rule, 0) == 0) {
if (m) {
m_freem(m);
@@ -520,7 +519,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
if (i == IP_FW_PASS) /* a PASS rule. */
return 1;
- if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) {
+ if (ip_dn_io_ptr && (i == IP_FW_DUMMYNET)) {
/*
* Pass the pkt to dummynet, which consumes it.
* If shared, make a copy and keep the original.
@@ -766,7 +765,7 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
* Allow dummynet and/or ipfw to claim the frame.
* Do not do this for PROMISC frames in case we are re-entered.
*/
- if (IPFW_LOADED && V_ether_ipfw != 0 && !(m->m_flags & M_PROMISC)) {
+ if (ip_fw_chk_ptr && V_ether_ipfw != 0 && !(m->m_flags & M_PROMISC)) {
struct ip_fw *rule = ip_dn_claim_rule(m);
if (ether_ipfw_chk(&m, NULL, &rule, 0) == 0) {
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 28f6e3a..9074bff 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -40,7 +40,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipx.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index a5e0b19..4f30db4 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -32,7 +32,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 50279a2..6405725 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -32,7 +32,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 99daf66..a6d25dc 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -43,7 +43,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipx.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index cc9251b..2bbccac 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -39,7 +39,6 @@
#include "opt_inet6.h"
#include "opt_ipx.h"
#include "opt_route.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 1c2c649..911804e 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -76,7 +76,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index df965be..6b352e8 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -20,7 +20,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipx.h"
-#include "opt_mac.h"
#include <sys/param.h>
#include <sys/priv.h>
OpenPOWER on IntegriCloud