From 9c493ee634c3c97b1d640bb6a0c460ae4ac092cf Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <vnatarajan@atheros.com>
Date: Thu, 27 Jan 2011 14:45:10 +0530
Subject: [PATCH] --- yaml --- r: 236927 b: refs/heads/master c:
 bdd62c067d596e2469b243af9887f46e5d47d971 h: refs/heads/master i:   236925:
 e6916972a430e412f347917f11972ca11c8aec71   236923:
 9505fd374d32ab512d6f4688eb5e443ab44f9af7   236919:
 16adee612dffe8a4f586d7508fc7cdaa16f6bd65   236911:
 8d3ac097535fe1120852e855ec3ab7b11bd08aef   236895:
 d74924ea4715483e52cf2a5c42fc6d8226f5d0f1   236863:
 dc86abe2eb975da6f677ecb3918b4752d5f4c7c6   236799:
 21adee5a295830d43ea85dbbe6e3dc11c08115db v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/xmit.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5dc43e31460a..2ddfd7448496 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22983c301f01b297a6f85de4757108c6b0eac792
+refs/heads/master: bdd62c067d596e2469b243af9887f46e5d47d971
diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
index 10a3dbefaa09..d211aa7f1a3b 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
@@ -563,8 +563,11 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
 	rcu_read_unlock();
 
-	if (needreset)
+	if (needreset) {
+		spin_unlock_bh(&sc->sc_pcu_lock);
 		ath_reset(sc, false);
+		spin_lock_bh(&sc->sc_pcu_lock);
+	}
 }
 
 static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,