PERFORCE change 108554 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=108554

Change 108554 by rwatson at rwatson_zoo on 2006/10/27 07:14:38

	Update for mac_framework.h.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#29 edit
.. //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#29 (text+ko) ====

@@ -47,7 +47,6 @@
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #include <sys/random.h>
 #endif
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 
@@ -96,6 +95,10 @@
 
 #include <net/if_sppp.h>
 
+#if defined(__FreeBSD__) && __FreeBSD__ >= 7
+#include <security/mac/mac_framework.h>
+#endif
+
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 # define IOCTL_CMD_T	u_long
 #else

==== //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#11 (text+ko) ====

@@ -34,7 +34,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/module.h>
@@ -46,6 +45,8 @@
 #define PACKETPTR	struct mbuf *
 #include <net/ppp_comp.h>
 
+#include <security/mac/mac_framework.h>
+
 #define DEFLATE_DEBUG	1
 
 /*