ath9k: optimize the hardware hang check

Since it's only called when beacons are stuck, move it to the SWBA handler
tasklet, to avoid doing redundant checks on every single interrupt.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 3 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 626418222c85..df5b6acd805f 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -369,6 +369,9 @@ void ath_beacon_tasklet(unsigned long data)
         if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
                 sc->beacon.bmisscnt++;
 
+                if (!ath9k_hw_check_alive(ah))
+                        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+
                 if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
                         ath_dbg(common, BSTUCK,
                                 "missed %u consecutive beacons\n",
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c8d123957188..384e5c498440 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -692,17 +692,6 @@ void ath9k_tasklet(unsigned long data)
                 goto out;
         }
 
-        /*
-         * Only run the baseband hang check if beacons stop working in AP or
-         * IBSS mode, because it has a high false positive rate. For station
-         * mode it should not be necessary, since the upper layers will detect
-         * this through a beacon miss automatically and the following channel
-         * change will trigger a hardware reset anyway
-         */
-        if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
-            !ath9k_hw_check_alive(ah))
-                ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-
         if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
                 /*
                  * TSF sync does not look correct; remain awake to sync with