From owner-p4-projects@FreeBSD.ORG  Wed Feb  7 00:40:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 685C916A40E; Wed,  7 Feb 2007 00:40:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4E6A816A402
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 00:39:56 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 34CD513C4A3
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 00:39:56 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l170duhd012161
	for <perforce@freebsd.org>; Wed, 7 Feb 2007 00:39:56 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l170dtfn012158
	for perforce@freebsd.org; Wed, 7 Feb 2007 00:39:55 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 7 Feb 2007 00:39:55 GMT
Message-Id: <200702070039.l170dtfn012158@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114135 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: Wed, 07 Feb 2007 00:40:09 -0000

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

Change 114135 by csjp@csjp_rnd01 on 2007/02/07 00:39:25

	Clean up some additions I made to the zbuf header structure that
	accidently made it in my last submit.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf.h#8 edit
.. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#13 edit

Differences ...

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

@@ -186,10 +186,7 @@
 	volatile u_int	bzh_kernel_gen;	/* Kernel generation number. */
 	volatile u_int	bzh_kernel_len;	/* Length of buffer. */
 	volatile u_int	bzh_user_gen;	/* User generation number. */
-	void	*bzh_hbuf;
-	void	*bzh_fbuf;
-	void	*bzh_sbuf;
-	u_char	_bzh_pad[28];
+	u_char	_bzh_pad[5];
 };
 
 /*

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

@@ -374,9 +374,6 @@
 	KASSERT(zb != NULL, ("bpf_zerocopy_bufheld: zb == NULL"));
 	zb->zb_header->bzh_kernel_len = d->bd_hlen;
 	zb->zb_header->bzh_kernel_gen++;
-	zb->zb_header->bzh_hbuf = d->bd_hbuf;
-	zb->zb_header->bzh_fbuf = d->bd_fbuf;
-	zb->zb_header->bzh_sbuf = d->bd_sbuf;
 }
 
 /*