From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 11:49:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68DFB16A4E1; Thu,  6 Jul 2006 11:49:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2C38D16A4DE
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 11:49:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 594E743D45
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 11:49:21 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BnLL4067770
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 11:49:21 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BnKuV067767
	for perforce@freebsd.org; Thu, 6 Jul 2006 11:49:20 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 Jul 2006 11:49:20 GMT
Message-Id: <200607061149.k66BnKuV067767@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100728 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jul 2006 11:49:22 -0000

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

Change 100728 by rwatson@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>