From owner-svn-src-all@FreeBSD.ORG  Fri Dec 19 00:19:47 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C6C2106564A;
	Fri, 19 Dec 2008 00:19:47 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EBB98FC12;
	Fri, 19 Dec 2008 00:19:47 +0000 (UTC)
	(envelope-from delphij@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 mBJ0Jldk056222;
	Fri, 19 Dec 2008 00:19:47 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBJ0JlFR056221;
	Fri, 19 Dec 2008 00:19:47 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200812190019.mBJ0JlFR056221@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 19 Dec 2008 00:19:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186305 - in releng/7.1/sys: . contrib/pf dev/bce
	dev/cxgb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Dec 2008 00:19:47 -0000

Author: delphij
Date: Fri Dec 19 00:19:46 2008
New Revision: 186305
URL: http://svn.freebsd.org/changeset/base/186305

Log:
  MFC r186168:
  
  Test whether sc->tx_mbuf_map[i], not whether sc->tx_mbuf_map is NULL before
  doing bus_dmamap_sync() since it operates on the former, not the latter.
  
  Reviewed by:	davidch
  Approved by:	re (kensmith)

Modified:
  releng/7.1/sys/   (props changed)
  releng/7.1/sys/contrib/pf/   (props changed)
  releng/7.1/sys/dev/bce/if_bce.c
  releng/7.1/sys/dev/cxgb/   (props changed)

Modified: releng/7.1/sys/dev/bce/if_bce.c
==============================================================================
--- releng/7.1/sys/dev/bce/if_bce.c	Fri Dec 19 00:17:09 2008	(r186304)
+++ releng/7.1/sys/dev/bce/if_bce.c	Fri Dec 19 00:19:46 2008	(r186305)
@@ -5114,7 +5114,7 @@ bce_free_tx_chain(struct bce_softc *sc)
 	/* Unmap, unload, and free any mbufs still in the TX mbuf chain. */
 	for (i = 0; i < TOTAL_TX_BD; i++) {
 		if (sc->tx_mbuf_ptr[i] != NULL) {
-			if (sc->tx_mbuf_map != NULL)
+			if (sc->tx_mbuf_map[i] != NULL)
 				bus_dmamap_sync(sc->tx_mbuf_tag, sc->tx_mbuf_map[i],
 					BUS_DMASYNC_POSTWRITE);
 			m_freem(sc->tx_mbuf_ptr[i]);