From owner-p4-projects@FreeBSD.ORG  Tue Jan  8 15:38:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E26316A46D; Tue,  8 Jan 2008 15:38:49 +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 43DB116A469
	for <perforce@freebsd.org>; Tue,  8 Jan 2008 15:38:49 +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 6096813C478
	for <perforce@freebsd.org>; Tue,  8 Jan 2008 15:38:49 +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 m08Fcnac028783
	for <perforce@freebsd.org>; Tue, 8 Jan 2008 15:38:49 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 m08FcnJl028780
	for perforce@freebsd.org; Tue, 8 Jan 2008 15:38:49 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 8 Jan 2008 15:38:49 GMT
Message-Id: <200801081538.m08FcnJl028780@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 132793 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: Tue, 08 Jan 2008 15:38:49 -0000

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

Change 132793 by rwatson@rwatson_fledge on 2008/01/08 15:38:40

	More re-merging of new BPF contents since original integration in
	order to reduce differences.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf.h#17 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/net/bpf.h#17 (text+ko) ====

@@ -123,13 +123,6 @@
 	size_t	 bz_buflen;	/* Size of zero-copy buffers. */
 };
 
-/* Packet directions */
-enum bpf_direction {
-        BPF_D_IN,       /* See incoming packets */
-        BPF_D_INOUT,    /* See incoming and outgoing packets */
-        BPF_D_OUT       /* See outgoing packets */
-};
-
 #define	BIOCGBLEN	_IOR('B',102, u_int)
 #define	BIOCSBLEN	_IOWR('B',102, u_int)
 #define	BIOCSETF	_IOW('B',103, struct bpf_program)
@@ -167,6 +160,13 @@
 #define	BIOCSETZBUF	_IOW('B', 131, struct bpf_zbuf)
 #define	BIOCFEEDBACK	_IOW('B', 132, u_int)
 
+/* Packet directions */
+enum bpf_direction {
+        BPF_D_IN,       /* See incoming packets */
+        BPF_D_INOUT,    /* See incoming and outgoing packets */
+        BPF_D_OUT       /* See outgoing packets */
+};
+
 /*
  * Structure prepended to each packet.
  */