svn commit: r193611 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb

[Kip Macy]

Author: kmacy
Date: Sun Jun  7 04:58:34 2009
New Revision: 193611
URL: http://svn.freebsd.org/changeset/base/193611

Log:
  update wr_lo on first WR in a multi-WR send

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sun Jun  7 04:49:23 2009	(r193610)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Sun Jun  7 04:58:34 2009	(r193611)
@@ -1289,7 +1289,7 @@ write_wr_hdr_sgl(unsigned int ndesc, str
 				txd = txq->desc;
 				txsd = txq->sdesc;
 			}
-			
+
 			/*
 			 * when the head of the mbuf chain
 			 * is freed all clusters will be freed
@@ -1305,9 +1305,8 @@ write_wr_hdr_sgl(unsigned int ndesc, str
 			flits = 1;
 		}
 		wrp->wrh_hi |= htonl(F_WR_EOP);
-		
-		set_wr_hdr(wrp, wrp->wrh_hi,
-		    htonl(V_WR_LEN(WR_FLITS) | V_WR_GEN(ogen)) | wr_lo);
+		wmb();
+		wp->wrh_lo = htonl(V_WR_LEN(WR_FLITS) | V_WR_GEN(ogen)) | wr_lo;
 		wr_gen2((struct tx_desc *)wp, ogen);
 	}
 }
@@ -1368,6 +1367,7 @@ t3_encap(struct sge_qset *qs, struct mbu
 	if (m0->m_nextpkt != NULL) {
 		busdma_map_sg_vec(m0, segs, &nsegs);
 		ndesc = 1;
+		mlen = 0;
 	} else {
  		if ((err = busdma_map_sg_collapse(&m0, segs, &nsegs))) {
 			if (cxgb_debug)