---

yaml --- r: 351960 b: refs/heads/master c: 0a62acb h: refs/heads/master v: v3
git-mirror · Jan 22, 2013 · c8668e4 · c8668e4
1 parent e62c93d
commit c8668e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eee569e403861392dc693ab984ede5f0610dde29
+refs/heads/master: 0a62acb1c9da58b54cb1c9fa6604a36507a61d48
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -196,10 +196,10 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 	ath9k_debug_samp_bb_mac(sc);
 	ath9k_hw_disable_interrupts(ah);
 
-	if (!ath_stoprecv(sc))
+	if (!ath_drain_all_txq(sc, retry_tx))
 		ret = false;
 
-	if (!ath_drain_all_txq(sc, retry_tx))
+	if (!ath_stoprecv(sc))
 		ret = false;
 
 	if (!flush) {