aboutsummaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-06-05 14:55:22 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-06-05 14:55:22 +0000
commitbcf11e8d0048006ba97cb460a134cc23290428b2 (patch)
tree476e08b4812ed877bdf927598a5c7deae99fdcdf /sys/net
parent88a9a9a61ce829ebdcc3fdf320c3c6270175566f (diff)
downloadsrc-bcf11e8d0048006ba97cb460a134cc23290428b2.tar.gz
src-bcf11e8d0048006ba97cb460a134cc23290428b2.zip
Move "options MAC" from opt_mac.h to opt_global.h, as it's now in GENERIC
and used in a large number of files, but also because an increasing number of incorrect uses of MAC calls were sneaking in due to copy-and-paste of MAC-aware code without the associated opt_mac.h include. Discussed with: pjd
Notes
Notes: svn path=/head/; revision=193511
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_ethersubr.c1
-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
11 files changed, 0 insertions, 11 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index b944e2902cb0..c74d09fbf305 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 ffff619d2794..1a5dcd29e651 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 734acc5fb6e1..d8a331303bf1 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_ethersubr.c b/sys/net/if_ethersubr.c
index 19122d6e1f0a..02ff42222e2f 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"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 28f6e3a5ee3b..9074bffa5145 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 a5e0b19553ee..4f30db4a7bcd 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 50279a255ffd..64057254594f 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 99daf6692c1d..a6d25dc4d841 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 cc9251b1a114..2bbccac2c379 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 1c2c6496c8f7..911804e46663 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 df965beefad1..6b352e855c6e 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>