From owner-svn-src-user@FreeBSD.ORG  Sun Sep 18 09:42:21 2011
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 B5497106566C;
	Sun, 18 Sep 2011 09:42:21 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A45018FC0A;
	Sun, 18 Sep 2011 09:42:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8I9gLB4024599;
	Sun, 18 Sep 2011 09:42:21 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8I9gLTc024597;
	Sun, 18 Sep 2011 09:42:21 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109180942.p8I9gLTc024597@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 18 Sep 2011 09:42:21 +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: r225648 - user/adrian/if_ath_tx/sys/dev/ath
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, 18 Sep 2011 09:42:21 -0000

Author: adrian
Date: Sun Sep 18 09:42:21 2011
New Revision: 225648
URL: http://svn.freebsd.org/changeset/base/225648

Log:
  Move the lock around so it happens after the rate control update is done.
  (That way the ath_node lock and txq lock aren't held at the same time.)

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Sun Sep 18 09:05:42 2011	(r225647)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Sun Sep 18 09:42:21 2011	(r225648)
@@ -2813,10 +2813,6 @@ ath_tx_comp_aggr_error(struct ath_softc 
 	struct ieee80211_tx_ampdu *tap;
 	ath_bufhead bf_cq;
 
-	ATH_TXQ_LOCK(sc->sc_ac2q[tid->ac]);
-
-	tap = ath_tx_get_tx_tid(an, tid->tid);
-
 	TAILQ_INIT(&bf_q);
 	TAILQ_INIT(&bf_cq);
 	sc->sc_stats.ast_tx_aggrfail++;
@@ -2832,6 +2828,9 @@ ath_tx_comp_aggr_error(struct ath_softc 
 	    bf_first->bf_state.bfs_pktlen,
 	    bf_first->bf_state.bfs_nframes, bf_first->bf_state.bfs_nframes);
 
+	ATH_TXQ_LOCK(sc->sc_ac2q[tid->ac]);
+	tap = ath_tx_get_tx_tid(an, tid->tid);
+
 	/* Retry all subframes */
 	bf = bf_first;
 	while (bf) {