From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 21:13:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFA0316A421; Mon, 12 Nov 2007 21:13:38 +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 7191D16A419
	for <perforce@freebsd.org>; Mon, 12 Nov 2007 21:13:38 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 612B713C4B0
	for <perforce@freebsd.org>; Mon, 12 Nov 2007 21:13:38 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACLDcLO055408
	for <perforce@freebsd.org>; Mon, 12 Nov 2007 21:13:38 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACLDcos055405
	for perforce@freebsd.org; Mon, 12 Nov 2007 21:13:38 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 12 Nov 2007 21:13:38 GMT
Message-Id: <200711122113.lACLDcos055405@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128992 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: Mon, 12 Nov 2007 21:13:39 -0000

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

Change 128992 by kmacy@kmacy_home:ethng on 2007/11/12 21:13:31

	make mbuf_put as close to skb_put as possible in the absence of head and tailroom

Affected files ...

.. //depot/projects/ethng/src/sys/sys/linux_compat.h#8 edit

Differences ...

==== //depot/projects/ethng/src/sys/sys/linux_compat.h#8 (text+ko) ====

@@ -64,12 +64,11 @@
 static __inline caddr_t
 mbuf_put(struct mbuf *m, unsigned int len)
 {
-	caddr_t tmp = m->m_data;
+	caddr_t tmp = mtod(m, caddr_t);
 
-	panic("FIXME");
-	
-	m->m_data += len;
 	m->m_len += len;
+	if (m->m_flags & M_PKTHDR)
+		m->m_pkthdr.len += len;
 
 	return (tmp);
 }