You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
673 B
27 lines
673 B
13 years ago
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
@@ -235,7 +235,7 @@ static bool ath_prepare_reset(struct ath
|
||
|
|
{
|
||
|
|
struct ath_hw *ah = sc->sc_ah;
|
||
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
||
|
|
- bool ret;
|
||
|
|
+ bool ret = true;
|
||
|
|
|
||
|
|
ieee80211_stop_queues(sc->hw);
|
||
|
|
|
||
|
|
@@ -246,11 +246,12 @@ static bool ath_prepare_reset(struct ath
|
||
|
|
ath9k_debug_samp_bb_mac(sc);
|
||
|
|
ath9k_hw_disable_interrupts(ah);
|
||
|
|
|
||
|
|
- ret = ath_drain_all_txq(sc, retry_tx);
|
||
|
|
-
|
||
|
|
if (!ath_stoprecv(sc))
|
||
|
|
ret = false;
|
||
|
|
|
||
|
|
+ if (!ath_drain_all_txq(sc, retry_tx))
|
||
|
|
+ ret = false;
|
||
|
|
+
|
||
|
|
if (!flush) {
|
||
|
|
if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
|
||
|
|
ath_rx_tasklet(sc, 1, true);
|