openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: Fix RoC expiration 

mac80211 has to be notified when a RoC period
expires in the driver. In MCC mode, since the
offchannel/RoC timer is set with the requested
duration, ieee80211_remain_on_channel_expired() needs
to be called when the timer expires.

But, currently it is done after we move back to
the operating channel. This is incorrect - fix this
by calling ieee80211_remain_on_channel_expired() when
the RoC timer expires and in ath_roc_complete() when
the RoC request is aborted.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2014-10-17 07:40:26 +05:30 committed by John W. Linville
parent 828fe01acb
commit a350335c5f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath9k/channel.c
View File

@ -894,7 +894,7 @@ void ath_roc_complete(struct ath_softc *sc, bool abort)
sc->offchannel.roc_vif = NULL; sc->offchannel.roc_vif = NULL;
sc->offchannel.roc_chan = NULL; sc->offchannel.roc_chan = NULL;
if (!abort) if (abort)
ieee80211_remain_on_channel_expired(sc->hw); ieee80211_remain_on_channel_expired(sc->hw);
ath_offchannel_next(sc); ath_offchannel_next(sc);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
@ -1028,6 +1028,7 @@ static void ath_offchannel_timer(unsigned long data)
case ATH_OFFCHANNEL_ROC_WAIT: case ATH_OFFCHANNEL_ROC_WAIT:
ctx = ath_chanctx_get_oper_chan(sc, false); ctx = ath_chanctx_get_oper_chan(sc, false);
sc->offchannel.state = ATH_OFFCHANNEL_ROC_DONE; sc->offchannel.state = ATH_OFFCHANNEL_ROC_DONE;
ieee80211_remain_on_channel_expired(sc->hw);
ath_chanctx_switch(sc, ctx, NULL); ath_chanctx_switch(sc, ctx, NULL);
break; break;
default: default: