2012-03-10 12:59:40 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/beacon.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
|
2012-03-13 07:56:01 +00:00
|
|
|
@@ -369,6 +369,9 @@ void ath_beacon_tasklet(unsigned long da
|
2012-03-10 12:59:40 +00:00
|
|
|
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",
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
@@ -695,17 +695,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
|
