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

11 files changed, 0 insertions, 11 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_ethersubr.c b/sys/net/if_ethersubr.c
index 19122d6..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"
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>