From eb1d8ece94dff854dd58f855b4d7295973c81547 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 24 May 2012 14:32:19 +0200 Subject: [PATCH] --- yaml --- r: 309507 b: refs/heads/master c: ceea2a51969f8b578777c99ec2718021427770c3 h: refs/heads/master i: 309505: 66e066a8b7d5294e57af6b24687ee88ff34c88d5 309503: 566e2eba9853189b4998abaa521dabd9269ed872 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bb2682ceade7..d1a2b72f190d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b4760e301e1cceb0b49bd2b921d6b394d364584 +refs/heads/master: ceea2a51969f8b578777c99ec2718021427770c3 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index dfa78e8b6470..4de4473776ac 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -239,7 +239,7 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush) { 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); @@ -250,11 +250,12 @@ 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); - 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);