From owner-svn-src-user@FreeBSD.ORG  Sun Jun  7 04:58:35 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DE431065673;
	Sun,  7 Jun 2009 04:58:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D03E8FC1B;
	Sun,  7 Jun 2009 04:58:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n574wZBk082087;
	Sun, 7 Jun 2009 04:58:35 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n574wYFW082086;
	Sun, 7 Jun 2009 04:58:34 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906070458.n574wYFW082086@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 7 Jun 2009 04:58:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193611 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2009 04:58:35 -0000

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)