From owner-p4-projects  Fri Jun 14  1:39:15 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8949337B416; Fri, 14 Jun 2002 01:38:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2B12837B40F
	for <perforce@freebsd.org>; Fri, 14 Jun 2002 01:38:12 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5E8cB512980
	for perforce@freebsd.org; Fri, 14 Jun 2002 01:38:11 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 14 Jun 2002 01:38:11 -0700 (PDT)
Message-Id: <200206140838.g5E8cB512980@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 12901 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12901

Change 12901 by rwatson@rwatson_paprika on 2002/06/14 01:37:34

	Diff reduce.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#10 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ah_output.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/dest6.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/esp_core.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/frag6.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_cksum.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_gif.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#8 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_rmx.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.c#7 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#8 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#7 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_core.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_input.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_output.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/scope6.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#9 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#7 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/krpc_subr.c#5 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#6 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#5 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#8 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#7 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#10 edit
... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#5 edit
... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#10 edit
... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvcache.c#3 edit
... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#5 edit
... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsubs.c#7 edit
... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#10 (text+ko) ====

@@ -43,7 +43,6 @@
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
-#include <sys/mac.h>
 #include <sys/ucred.h>
 #include <net/if.h>
 #include <net/route.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#6 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_output.c#4 (text+ko) ====

@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/dest6.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_core.c#5 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#6 (text+ko) ====

@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#4 (text+ko) ====

@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/frag6.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_cksum.c#3 (text+ko) ====

@@ -66,7 +66,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <netinet/in.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_gif.c#4 (text+ko) ====

@@ -37,7 +37,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/queue.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#4 (text+ko) ====

@@ -31,7 +31,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#8 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#4 (text+ko) ====

@@ -75,7 +75,6 @@
 #include <sys/protosw.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_rmx.c#4 (text+ko) ====

@@ -80,7 +80,6 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 

==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#5 (text+ko) ====

@@ -70,7 +70,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#6 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.c#7 (text+ko) ====

@@ -64,7 +64,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#8 (text+ko) ====

@@ -73,7 +73,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#7 (text+ko) ====

@@ -72,7 +72,6 @@
 #include "opt_pfil_hooks.h"
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_core.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_input.c#4 (text+ko) ====

@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_output.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#4 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#3 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#5 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#5 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#4 (text+ko) ====

@@ -34,7 +34,6 @@
 #include "opt_inet6.h"
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/systm.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/scope6.c#4 (text+ko) ====

@@ -31,7 +31,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#5 (text+ko) ====

@@ -70,7 +70,6 @@
 #include "opt_inet6.h"
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>

==== //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#6 (text+ko) ====

@@ -40,7 +40,6 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/file.h>		/* Must come after sys/malloc.h */
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/poll.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#9 (text+ko) ====

@@ -36,7 +36,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/poll.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#7 (text+ko) ====

@@ -49,7 +49,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sockio.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mbuf.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/krpc_subr.c#5 (text+ko) ====

@@ -47,7 +47,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#6 (text+ko) ====

@@ -36,7 +36,6 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>		/* for hz */
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/lockf.h>		/* for hz */ /* Must come after sys/malloc.h */
 #include <sys/mbuf.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#5 (text+ko) ====

@@ -52,7 +52,6 @@
 #include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#8 (text+ko) ====

@@ -47,7 +47,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#7 (text+ko) ====

@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#10 (text+ko) ====

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

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#5 (text+ko) ====

@@ -53,7 +53,6 @@
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#10 (text+ko) ====

@@ -82,7 +82,6 @@
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/dirent.h>

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvcache.c#3 (text+ko) ====

@@ -48,7 +48,6 @@
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>	/* for dup_sockaddr */

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#5 (text+ko) ====

@@ -48,7 +48,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsubs.c#7 (text+ko) ====

@@ -55,7 +55,6 @@
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#6 (text+ko) ====

@@ -53,7 +53,6 @@
 #include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message