---

yaml --- r: 236927 b: refs/heads/master c: bdd62c0 h: refs/heads/master i: 236925: e691697 236923: 9505fd3 236919: 16adee6 236911: 8d3ac09 236895: d74924e 236863: dc86abe 236799: 21adee5 v: v3
git-mirror · Jan 28, 2011 · 9c493ee · 9c493ee
1 parent 77f27c8
commit 9c493ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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,