From owner-p4-projects@FreeBSD.ORG  Wed Feb  7 02:52:23 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 8054216A521; Wed,  7 Feb 2007 02:52:14 +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 792F116A5B1
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 02:52:13 +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 21C0013C4F5
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 02:51:49 +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 l172pkgs045312
	for <perforce@freebsd.org>; Wed, 7 Feb 2007 02:51:46 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l172pjJA045309
	for perforce@freebsd.org; Wed, 7 Feb 2007 02:51:45 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 7 Feb 2007 02:51:45 GMT
Message-Id: <200702070251.l172pjJA045309@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 114148 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 02:52:23 -0000

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

Change 114148 by csjp@csjp_rnd01 on 2007/02/07 02:50:51

	Make sure we are checking for the presence of BPF zerocopy rather
	then just assuming we are using it.

Affected files ...

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

Differences ...

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

@@ -310,6 +310,19 @@
 }
 
 static int
+bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
+{
+
+	if (d->bd_bufmode != BPF_BUFMODE_ZBUF)
+		return (EOPNOTSUPP);
+#ifdef BPF_ZEROCOPY
+	return (bpf_zerocopy_ioctl_rotate(td, d, bz));
+#else
+	panic("bpf_ioctl_rotate");
+#endif
+}
+
+static int
 bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
 {
 
@@ -1285,8 +1298,7 @@
 		return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr));
 
 	case BIOCROTZBUF:
-		return (bpf_zerocopy_ioctl_rotate(td, d, (struct bpf_zbuf *)
-		    addr));
+		return (bpf_ioctl_rotate(td, d, (struct bpf_zbuf *) addr));
 	}
 	return (error);
 }