PERFORCE change 138481 for review

Robert Watson rwatson at FreeBSD.org
Mon Mar 24 22:23:07 UTC 2008


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

Change 138481 by rwatson at rwatson_cinnamon on 2008/03/24 22:22:08

	Integrate zcopybpf branch from FreeBSD CVS.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/if_enc.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_loop.c#4 integrate

Differences ...

==== //depot/projects/zcopybpf/src/sys/net/if_enc.c#4 (text+ko) ====

@@ -46,7 +46,6 @@
 #include <net/route.h>
 #include <net/netisr.h>
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

==== //depot/projects/zcopybpf/src/sys/net/if_loop.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/if_loop.c,v 1.113 2007/10/27 18:25:53 yar Exp $
+ * $FreeBSD: src/sys/net/if_loop.c,v 1.114 2008/03/24 22:16:46 jkim Exp $
  */
 
 /*
@@ -57,7 +57,6 @@
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 
 #ifdef	INET
 #include <netinet/in.h>


More information about the p4-projects mailing list