leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: skip beaconing when reset work is pending

Browse Source 
Whenever the reset work is queued up, do not generate beacon. And also
clear the beacon miss count once the beacon stuck was observed.

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rajkumar Manoharan 2012-04-13 16:44:21 +05:30 committed by John W. Linville
parent af1e8a6fb4
commit 4e7fb7187d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ath/ath9k/beacon.c
View File

@ -359,6 +359,11 @@ void ath_beacon_tasklet(unsigned long data)
int slot; int slot;
u32 bfaddr, bc = 0; u32 bfaddr, bc = 0;
if (work_pending(&sc->hw_reset_work)) {
ath_dbg(common, RESET,
"reset work is pending, skip beaconing now\n");
return;
}
/* /*
* Check if the previous beacon has gone out. If * Check if the previous beacon has gone out. If
* not don't try to post another, skip this period * not don't try to post another, skip this period
@ -381,6 +386,7 @@ void ath_beacon_tasklet(unsigned long data)
ath9k_hw_bstuck_nfcal(ah); ath9k_hw_bstuck_nfcal(ah);
} else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) { } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
ath_dbg(common, BSTUCK, "beacon is officially stuck\n"); ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
sc->beacon.bmisscnt = 0;
sc->sc_flags |= SC_OP_TSF_RESET; sc->sc_flags |= SC_OP_TSF_RESET;
ieee80211_queue_work(sc->hw, &sc->hw_reset_work); ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
} }