diff options
author | rwatson <rwatson@FreeBSD.org> | 2006-10-22 11:52:19 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2006-10-22 11:52:19 +0000 |
commit | 7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb (patch) | |
tree | 15bbe7ba3ad64d39db33baa0b88a2dae4206568e /sys/net | |
parent | cbcb760109a202fb847f48aa942a8b84b1e85015 (diff) | |
download | FreeBSD-src-7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb.zip FreeBSD-src-7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb.tar.gz |
Complete break-out of sys/sys/mac.h into sys/security/mac/mac_framework.h
begun with a repo-copy of mac.h to mac_framework.h. sys/mac.h now
contains the userspace and user<->kernel API and definitions, with all
in-kernel interfaces moved to mac_framework.h, which is now included
across most of the kernel instead.
This change is the first step in a larger cleanup and sweep of MAC
Framework interfaces in the kernel, and will not be MFC'd.
Obtained from: TrustedBSD Project
Sponsored by: SPARTA
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/bpf.c | 3 | ||||
-rw-r--r-- | sys/net/bsd_comp.c | 3 | ||||
-rw-r--r-- | sys/net/if.c | 3 | ||||
-rw-r--r-- | sys/net/if_atmsubr.c | 3 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 3 | ||||
-rw-r--r-- | sys/net/if_fddisubr.c | 3 | ||||
-rw-r--r-- | sys/net/if_fwsubr.c | 3 | ||||
-rw-r--r-- | sys/net/if_gif.c | 3 | ||||
-rw-r--r-- | sys/net/if_iso88025subr.c | 3 | ||||
-rw-r--r-- | sys/net/if_ppp.c | 3 | ||||
-rw-r--r-- | sys/net/if_stf.c | 3 | ||||
-rw-r--r-- | sys/net/if_tun.c | 3 |
12 files changed, 24 insertions, 12 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 12c3052..571d730 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -45,7 +45,6 @@ #include <sys/systm.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/time.h> @@ -77,6 +76,8 @@ #include <net80211/ieee80211_freebsd.h> +#include <security/mac/mac_framework.h> + static MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); #if defined(DEV_BPF) || defined(NETGRAPH_BPF) diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index 3071fc3..139f772 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -45,7 +45,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> @@ -55,6 +54,8 @@ #define PACKETPTR struct mbuf * #include <net/ppp_comp.h> +#include <security/mac/mac_framework.h> + /* * PPP "BSD compress" compression * The differences between this compression and the classic BSD LZW diff --git a/sys/net/if.c b/sys/net/if.c index 278b4a8..ba981d4 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/conf.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/sbuf.h> #include <sys/bus.h> @@ -82,6 +81,8 @@ #include <netinet/ip_carp.h> #endif +#include <security/mac/mac_framework.h> + SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers"); SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management"); diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index d3f7956..bb972b8 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> -#include <sys/mac.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> @@ -71,6 +70,8 @@ __FBSDID("$FreeBSD$"); #include <netnatm/natm.h> #endif +#include <security/mac/mac_framework.h> + /* * Netgraph interface functions. * These need not be protected by a lock, because ng_atm nodes are persitent. diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 5ba7297..61fa58b 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -41,7 +41,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/module.h> #include <sys/mbuf.h> @@ -97,6 +96,8 @@ extern u_char at_org_code[3]; extern u_char aarp_org_code[3]; #endif /* NETATALK */ +#include <security/mac/mac_framework.h> + /* netgraph node hooks for ng_ether(4) */ void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index cc4b1fc..a2fd00b 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -45,7 +45,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> @@ -89,6 +88,8 @@ extern u_char at_org_code[ 3 ]; extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ +#include <security/mac/mac_framework.h> + static const u_char fddibroadcastaddr[FDDI_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 774e206..a39f194 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -37,7 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> @@ -62,6 +61,8 @@ #include <netinet6/nd6.h> #endif +#include <security/mac/mac_framework.h> + MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals"); struct fw_hwaddr firewire_broadcastaddr = { diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 3fb8aeb..dfe69bd 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -37,7 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> @@ -84,6 +83,8 @@ #include <net/if_bridgevar.h> #include <net/if_gif.h> +#include <security/mac/mac_framework.h> + #define GIFNAME "gif" /* diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 14c6f98..8dca499 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -48,7 +48,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/mac.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> @@ -79,6 +78,8 @@ #include <netipx/ipx_if.h> #endif +#include <security/mac/mac_framework.h> + static const u_char iso88025_broadcastaddr[ISO88025_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 4d884ef..87f9a41 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -88,7 +88,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/mac.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/filio.h> @@ -123,6 +122,8 @@ #include <net/if_ppp.h> #include <net/if_pppvar.h> +#include <security/mac/mac_framework.h> + /* minimise diffs */ #ifndef splsoftnet #define splsoftnet splnet diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 3100c95..2f53c44 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -82,7 +82,6 @@ #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/mac.h> #include <sys/mbuf.h> #include <sys/errno.h> #include <sys/kernel.h> @@ -117,6 +116,8 @@ #include <net/bpf.h> +#include <security/mac/mac_framework.h> + #define STFNAME "stf" #define STFUNIT 0 diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index ddf6412..0787669 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -25,7 +25,6 @@ #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> -#include <sys/mac.h> #include <sys/mbuf.h> #include <sys/module.h> #include <sys/socket.h> @@ -56,6 +55,8 @@ #include <sys/queue.h> +#include <security/mac/mac_framework.h> + /* * tun_list is protected by global tunmtx. Other mutable fields are * protected by tun->tun_mtx, or by their owning subsystem. tun_dev is |