From owner-p4-projects@FreeBSD.ORG  Tue Mar 11 14:43:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D98651065672; Tue, 11 Mar 2008 14:43:33 +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 98F13106566C
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 14:43:33 +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 6DAFB8FC1F
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 14:43:33 +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 m2BEhXRu038925
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 14:43:33 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 m2BEhXdC038923
	for perforce@freebsd.org; Tue, 11 Mar 2008 14:43:33 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 11 Mar 2008 14:43:33 GMT
Message-Id: <200803111443.m2BEhXdC038923@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 137399 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, 11 Mar 2008 14:43:34 -0000

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

Change 137399 by rwatson@rwatson_cinnamon on 2008/03/11 14:42:42

	Don't optimize failure handling in BPF buffer setup, and hence
	avoid redundant checks.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#31 edit

Differences ...

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

@@ -464,19 +464,7 @@
 		return (EINVAL);
 
 	/*
-	 * As a simplifying assumption, we allow buffers to be designated
-	 * only once per descriptor.  Checked up front to save some trouble,
-	 * as we can more easily return EINVAL here; if the system is low on
-	 * sf_bufs, then it will be ENOMEM later.
-	 *
-	 * Note: lockless read.
-	 */
-	if (d->bd_hbuf != NULL || d->bd_sbuf != NULL || d->bd_fbuf != NULL ||
-	    d->bd_bif != NULL)
-		return (EINVAL);
-
-	/*
-	 * Allocate new buffers if required.
+	 * Allocate new buffers.
 	 */
 	error = zbuf_setup(td, (vm_offset_t)bz->bz_bufa, bz->bz_buflen,
 	    &zba);