From owner-p4-projects@FreeBSD.ORG  Mon Mar 24 22:23:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55893106566B; Mon, 24 Mar 2008 22:23:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14DF7106566C
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:23:07 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA20A8FC15
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:23:06 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OMN60Y079385
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:23:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OMN6QB079383
	for perforce@freebsd.org; Mon, 24 Mar 2008 22:23:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 24 Mar 2008 22:23:06 GMT
Message-Id: <200803242223.m2OMN6QB079383@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 138481 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: Mon, 24 Mar 2008 22:23:07 -0000

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

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