From owner-svn-src-all@FreeBSD.ORG  Thu May  9 15:57:55 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BA35C208;
 Thu,  9 May 2013 15:57:55 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AACFDECF;
 Thu,  9 May 2013 15:57:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r49FvtgV029023;
 Thu, 9 May 2013 15:57:55 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49FvtEr029022;
 Thu, 9 May 2013 15:57:55 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201305091557.r49FvtEr029022@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 9 May 2013 15:57:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250408 - head/sys/dev/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 09 May 2013 15:57:55 -0000

Author: adrian
Date: Thu May  9 15:57:55 2013
New Revision: 250408
URL: http://svnweb.freebsd.org/changeset/base/250408

Log:
  Update the holding buffer locking for EDMA.

Modified:
  head/sys/dev/ath/if_ath_tx_edma.c

Modified: head/sys/dev/ath/if_ath_tx_edma.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx_edma.c	Thu May  9 14:43:36 2013	(r250407)
+++ head/sys/dev/ath/if_ath_tx_edma.c	Thu May  9 15:57:55 2013	(r250408)
@@ -409,7 +409,7 @@ ath_edma_xmit_handoff_mcast(struct ath_s
 		wh = mtod(bf_last->bf_m, struct ieee80211_frame *);
 		wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
 
-		/* sync descriptor to memory */
+		/* re-sync buffer to memory */
 		bus_dmamap_sync(sc->sc_dmat, bf_last->bf_dmamap,
 		   BUS_DMASYNC_PREWRITE);
 
@@ -734,9 +734,9 @@ ath_edma_tx_processq(struct ath_softc *s
 		 * buffer any longer.
 		 */
 		if (bf->bf_flags & ATH_BUF_FIFOEND) {
-			ATH_TXBUF_LOCK(sc);
+			ATH_TXQ_LOCK(txq);
 			ath_txq_freeholdingbuf(sc, txq);
-			ATH_TXBUF_UNLOCK(sc);
+			ATH_TXQ_UNLOCK(txq);
 		}
 
 		/*