PERFORCE change 127457 for review

Kip Macy kmacy at FreeBSD.org
Fri Oct 12 16:20:30 PDT 2007


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

Change 127457 by kmacy at 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;
 


More information about the p4-projects mailing list