From owner-p4-projects@FreeBSD.ORG Sun Dec 23 17:18:03 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4E94C16A41A; Sun, 23 Dec 2007 17:18:03 +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 4BE7716A417
for <perforce@freebsd.org>; Sun, 23 Dec 2007 17:17:59 +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 4AA1213C45A
for <perforce@freebsd.org>; Sun, 23 Dec 2007 17:17:59 +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 lBNHHxDx052753
for <perforce@freebsd.org>; Sun, 23 Dec 2007 17:17:59 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 lBNHHxmx052750
for perforce@freebsd.org; Sun, 23 Dec 2007 17:17:59 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 23 Dec 2007 17:17:59 GMT
Message-Id: <200712231717.lBNHHxmx052750@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 131479 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: Sun, 23 Dec 2007 17:18:03 -0000
http://perforce.freebsd.org/chv.cgi?CH=131479
Change 131479 by rwatson@rwatson_cinnamon on 2007/12/23 17:17:13
Use zero-copy flag instead of non-NULL zero-copy buffer pointer to
test for zero-copy being enabled.
Affected files ...
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#11 edit
Differences ...
==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#11 (text+ko) ====
@@ -285,7 +285,7 @@
cc = p->cc;
if (p->cc == 0) {
#ifdef BIOCSETBUFMODE
- if (p->zbuf1 != NULL) {
+ if (p->zerocopy) {
if (p->buffer != NULL)
pcap_ack_zbuf(p);
i = pcap_next_zbuf(p, &cc);
@@ -1141,7 +1141,7 @@
}
p->bufsize = v;
#ifdef BIOCSETBUFMODE
- if (p->zbuf1 == NULL) {
+ if (!p->zerocopy) {
#endif
p->buffer = (u_char *)malloc(p->bufsize);
if (p->buffer == NULL) {