PERFORCE change 100728 for review

[Robert Watson]

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

Change 100728 by rwatson at rwatson_zoo on 2006/07/06 11:48:45

	Include file update.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#2 edit
.. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#2 (text+ko) ====

@@ -45,7 +45,7 @@
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#2 (text+ko) ====

@@ -49,7 +49,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#2 (text+ko) ====

@@ -45,7 +45,7 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/kernel.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/domain.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>		/* XXXRW: Why is this needed? */
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#2 (text+ko) ====

@@ -65,7 +65,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 /* #include <sys/malloc.h> */
 #include <sys/domain.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#2 (text+ko) ====

@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>		/* for proc0 declaration */

==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #ifdef INET6

==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/mbuf.h>
 #include <sys/md5.h>
 #include <sys/proc.h>		/* for proc0 declaration */

==== //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
+#include <sys/mac_framework.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>