From owner-p4-projects@FreeBSD.ORG  Sat Nov 29 11:23:58 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFD5F16A4D0; Sat, 29 Nov 2003 11:23:57 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B49B16A4CE
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 11:23:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EEDEE43F75
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 11:23:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hATJNuXJ043001
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 11:23:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hATJNuch042998
	for perforce@freebsd.org; Sat, 29 Nov 2003 11:23:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 29 Nov 2003 11:23:56 -0800 (PST)
Message-Id: <200311291923.hATJNuch042998@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43155 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 29 Nov 2003 19:23:58 -0000

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

Change 43155 by sam@sam_ebb on 2003/11/29 11:23:07

	o don't let bpf_mtap2 fall back to bpf_tap; though it could
	  if the prepended data segment length was also zero
	o correct pktlen in bpf_mtap2 to include prepended segment

Affected files ...

.. //depot/projects/netperf/sys/net/bpf.c#11 edit

Differences ...

==== //depot/projects/netperf/sys/net/bpf.c#11 (text+ko) ====

@@ -1242,10 +1242,6 @@
 	u_int pktlen, slen;
 
 	pktlen = m_length(m, NULL);
-	if (pktlen == m->m_len) {
-		bpf_tap(bp, mtod(m, u_char *), pktlen);
-		return;
-	}
 	/*
 	 * Craft on-stack mbuf suitable for passing to bpf_filter.
 	 * Note that we cut corners here; we only setup what's
@@ -1254,6 +1250,7 @@
 	mb.m_next = m;
 	mb.m_data = data;
 	mb.m_len = dlen;
+	pktlen += dlen;
 
 	BPFIF_LOCK(bp);
 	for (d = bp->bif_dlist; d != 0; d = d->bd_next) {