From owner-p4-projects  Fri Jun 14  1: 8:22 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 37FF737B41A; Fri, 14 Jun 2002 01:07:36 -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 BE89A37B416
	for <perforce@freebsd.org>; Fri, 14 Jun 2002 01:07:34 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5E87Ym09935
	for perforce@freebsd.org; Fri, 14 Jun 2002 01:07:34 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 14 Jun 2002 01:07:34 -0700 (PDT)
Message-Id: <200206140807.g5E87Ym09935@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 12900 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=12900

Change 12900 by rwatson@rwatson_paprika on 2002/06/14 01:07:06

	Diff reduce.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/kern/vfs_export.c#6 edit
... //depot/projects/trustedbsd/mac/sys/net/bpf_filter.c#5 edit
... //depot/projects/trustedbsd/mac/sys/net/bridge.c#7 edit
... //depot/projects/trustedbsd/mac/sys/net/if.h#12 edit
... //depot/projects/trustedbsd/mac/sys/net/if_disc.c#4 edit
... //depot/projects/trustedbsd/mac/sys/net/if_ef.c#5 edit
... //depot/projects/trustedbsd/mac/sys/net/if_faith.c#10 edit
... //depot/projects/trustedbsd/mac/sys/net/if_media.c#4 edit
... //depot/projects/trustedbsd/mac/sys/net/if_mib.c#3 edit
... //depot/projects/trustedbsd/mac/sys/net/if_sl.c#8 edit
... //depot/projects/trustedbsd/mac/sys/net/if_tap.c#8 edit
... //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#8 edit
... //depot/projects/trustedbsd/mac/sys/net/intrq.c#4 edit
... //depot/projects/trustedbsd/mac/sys/net/net_osdep.c#4 edit
... //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#6 edit
... //depot/projects/trustedbsd/mac/sys/net/route.c#5 edit
... //depot/projects/trustedbsd/mac/sys/net/slcompress.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_UI.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_async.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_bpf.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_bridge.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_echo.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_frame_relay.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif_demux.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_hole.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#9 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_lmi.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_mppc.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_pptpgre.c#5 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_rfc1490.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_sample.c#3 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_split.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_tee.c#4 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_tty.c#6 edit
... //depot/projects/trustedbsd/mac/sys/netgraph/ng_vjc.c#4 edit

Differences ...

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

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

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

@@ -66,7 +66,6 @@
 #endif
 
 #ifdef _KERNEL
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #endif
 #include <net/bpf.h>

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

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

==== //depot/projects/trustedbsd/mac/sys/net/if.h#12 (text+ko) ====

@@ -37,11 +37,6 @@
 #ifndef _NET_IF_H_
 #define	_NET_IF_H_
 
-/*
- * XXX: this include of sys/mac.h is needed for ifreq to be defined, but
- * may need to go away someday.
- */
-#include <sys/mac.h>
 #include <sys/queue.h>
 
 /*

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

@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/module.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>

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

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

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

@@ -49,7 +49,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/errno.h>

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

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

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

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

==== //depot/projects/trustedbsd/mac/sys/net/if_sl.c#8 (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/proc.h>

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

@@ -42,7 +42,6 @@
 #include <sys/filedesc.h>
 #include <sys/filio.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/poll.h>

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

@@ -58,7 +58,6 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>

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

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

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

@@ -33,7 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

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

@@ -79,7 +79,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/mac/sys/net/route.c#5 (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/socket.h>

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

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

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

@@ -7,7 +7,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/netgraph/ng_UI.c#4 (text+ko) ====

@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>

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

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

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

@@ -53,7 +53,6 @@
 #include <sys/sysctl.h>
 #include <sys/linker.h>
 #include <sys/queue.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/ctype.h>
 #include <sys/sysctl.h>

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

@@ -57,7 +57,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 

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

@@ -60,7 +60,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/errno.h>

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

@@ -45,7 +45,6 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>

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

@@ -49,7 +49,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 <netgraph/ng_message.h>

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

@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>

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

@@ -47,7 +47,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/errno.h>

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

@@ -53,7 +53,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>

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

@@ -70,7 +70,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/errno.h>

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

@@ -77,7 +77,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/ctype.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/socket.h>

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

@@ -47,7 +47,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 <netgraph/ng_message.h>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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