2 --- a/drivers/net/wireless/ath/ath9k/main.c
3 +++ b/drivers/net/wireless/ath/ath9k/main.c
4 @@ -251,6 +251,9 @@ int ath_set_channel(struct ath_softc *sc
8 + if (!ath9k_hw_check_alive(ah))
11 /* XXX: do not flush receive queue here. We don't want
12 * to flush data frames already in queue because of
13 * changing channel. */
14 @@ -602,7 +605,15 @@ void ath9k_tasklet(unsigned long data)
16 spin_lock(&sc->sc_pcu_lock);
18 - if (!ath9k_hw_check_alive(ah))
20 + * Only run the baseband hang check if beacons stop working in AP or
21 + * IBSS mode, because it has a high false positive rate. For station
22 + * mode it should not be necessary, since the upper layers will detect
23 + * this through a beacon miss automatically and the following channel
24 + * change will trigger a hardware reset anyway
26 + if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
27 + !ath9k_hw_check_alive(ah))
28 ieee80211_queue_work(sc->hw, &sc->hw_check_work);
30 if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)