From owner-p4-projects@FreeBSD.ORG  Fri Oct 12 23:20:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B295B16A41A; Fri, 12 Oct 2007 23:20:29 +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 331A516A418
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 23:20:29 +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 2BCA713C474
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 23:20:29 +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 l9CNKSNo018227
	for <perforce@freebsd.org>; Fri, 12 Oct 2007 23:20:28 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNKSeN018224
	for perforce@freebsd.org; Fri, 12 Oct 2007 23:20:28 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 12 Oct 2007 23:20:28 GMT
Message-Id: <200710122320.l9CNKSeN018224@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 127457 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 23:20:30 -0000

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

Change 127457 by kmacy@kmacy_home:ethng on 2007/10/12 23:19:35

	remove extraneous initialization of software tx descriptor

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#31 edit

Differences ...

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

@@ -1315,18 +1315,13 @@
 		if (cxgb_debug)
 			printf("failed ... err=%d\n", err);
 		return (err);
-	}
-	if (m0->m_type == MT_DATA) {
+	} 
+	KASSERT(m0->m_pkthdr.len, ("empty packet nsegs=%d count=%d", nsegs, count));
+
+	if (m0->m_type == MT_DATA)
 		DPRINTF("mbuf type=%d tags:%d head=%p", m0->m_type, !SLIST_EMPTY(&m0->m_pkthdr.tags),
 		    SLIST_FIRST(&m0->m_pkthdr.tags));
-	} else {
-		mv = mtomv(m0);
-		txsd->mi.mi_flags = m0->m_flags;
-		txsd->mi.mi_data = NULL;
-		txsd->mi.mi_base = (caddr_t)m0;
-		txsd->mi.mi_type = m0->m_type;
-		txsd->mi.mi_len = m0->m_pkthdr.len;
-	}
+	 
 	mi_collapse_mbuf(&txsd->mi, m0);
 	mi = &txsd->mi;