From owner-p4-projects@FreeBSD.ORG  Thu Feb  1 18:15:19 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 9084D16A403; Thu,  1 Feb 2007 18:15:19 +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 67B2116A401
	for <perforce@freebsd.org>; Thu,  1 Feb 2007 18:15:19 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C9F113C442
	for <perforce@freebsd.org>; Thu,  1 Feb 2007 18:15:19 +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.13.6/8.13.6) with ESMTP id l11IFJZM088010
	for <perforce@freebsd.org>; Thu, 1 Feb 2007 18:15:19 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l11IFIqB088006
	for perforce@freebsd.org; Thu, 1 Feb 2007 18:15:18 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 1 Feb 2007 18:15:18 GMT
Message-Id: <200702011815.l11IFIqB088006@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 113852 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: Thu, 01 Feb 2007 18:15:19 -0000

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

Change 113852 by rwatson@rwatson_cinnamon on 2007/02/01 18:14:51

	Correct a bug in mbuf append mode, in which the offset into the
	mbuf wasn't properly taken into account -- as a result, instead of
	getting the next bit of the mbuf when crossing a page boundary,
	you got the same bit of the mbuf.

Affected files ...

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

Differences ...

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

@@ -329,9 +329,9 @@
 		KASSERT(m != NULL,
 		    ("bpf_zerocopy_append_mbuf: end of mbuf chain"));
 
-		count = min(m->m_len, len);
+		count = min(m->m_len - moffset, len);
 		count = min(count, PAGE_SIZE - poffset);
-		bcopy(mtod(m, void *),
+		bcopy(mtod(m, u_char *) + moffset,
 		    ((u_char *)sf_buf_kva(zb->zb_pages[page])) + poffset,
 		    count);