From owner-p4-projects@FreeBSD.ORG  Fri Oct 12 04:01:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF7C716A420; Fri, 12 Oct 2007 04:01:45 +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 617F016A41A
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 04:01:45 +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 366A713C469
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 04:01:45 +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 l9C41jl4060275
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 04:01:45 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C41jjo060272
	for perforce@freebsd.org; Fri, 12 Oct 2007 04:01:45 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 12 Oct 2007 04:01:45 GMT
Message-Id: <200710120401.l9C41jjo060272@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 127408 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: Fri, 12 Oct 2007 04:01:46 -0000

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

Change 127408 by kmacy@kmacy_home:ethng on 2007/10/12 04:00:59

	initialize pkthdr len in packet batching case as well with value of first packet

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#16 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#16 (text+ko) ====

@@ -171,13 +171,15 @@
 int
 busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs)
 {
-	struct mbuf *m0, *n = *m, *mhead;
+	struct mbuf *m0, *mhead, *n = *m;
 	struct mbuf_iovec *mi;
 	struct mbuf *marray[TX_MAX_SEGS];
 	int i, type, seg_count, defragged = 0, err = 0;
 	struct mbuf_vec *mv;
 	uma_zone_t zone;
 
+	KASSERT(n->m_pkthdr.len, ("packet has zero header len"));
+		
 	if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) 
 		m_tag_delete_chain(n, NULL);
 
@@ -277,6 +279,7 @@
 	
 	memcpy(m0, *m, sizeof(struct m_hdr) + sizeof(struct pkthdr));
 	m0->m_type = type;
+	KASSERT(m0->m_pkthdr.len, ("empty packet being marshalled"));
 	mv = mtomv(m0);
 	mv->mv_count = seg_count;
 	mv->mv_first = 0;
@@ -326,6 +329,7 @@
 	}
 
 	m0->m_flags = 0;
+	m0->m_pkthdr.len = m0->m_len = (*m)->m_len; /* not the real length but needs to be non-zero */
 	mv = mtomv(m0);
 	mv->mv_count = count;
 	mv->mv_first = 0;
@@ -334,6 +338,7 @@
 			m_tag_delete_chain(*mp, NULL);
 		busdma_map_mbuf_fast(*mp, segs);
 		_mcl_collapse_mbuf(mi, *mp);
+		KASSERT(mi->mi_len, ("empty packet"));
 	}
 
 	for (mp = m, i = 0; i < count; i++, mp++) {