Commit bb628eb9 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

ath9k: Fix offchannel duration calculation

Currently, different units are used for handling
sc->offchannel.duration. In scan mode, it contains jiffies and in RoC
mode, milliseconds is used. This causes confusion since in
ath_chanctx_switch(), TU_TO_USEC is used to determine the offchannel
duration, resulting in incorrect values. Fix this by using jiffies in
both modes.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bd81533d
...@@ -601,7 +601,7 @@ static void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx, ...@@ -601,7 +601,7 @@ static void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,
if (sc->next_chan == &sc->offchannel.chan) { if (sc->next_chan == &sc->offchannel.chan) {
sc->sched.offchannel_duration = sc->sched.offchannel_duration =
TU_TO_USEC(sc->offchannel.duration) + jiffies_to_usecs(sc->offchannel.duration) +
sc->sched.channel_switch_time; sc->sched.channel_switch_time;
if (chandef) { if (chandef) {
...@@ -688,7 +688,8 @@ void ath_offchannel_next(struct ath_softc *sc) ...@@ -688,7 +688,8 @@ void ath_offchannel_next(struct ath_softc *sc)
} else if (sc->offchannel.roc_vif) { } else if (sc->offchannel.roc_vif) {
vif = sc->offchannel.roc_vif; vif = sc->offchannel.roc_vif;
sc->offchannel.chan.txpower = vif->bss_conf.txpower; sc->offchannel.chan.txpower = vif->bss_conf.txpower;
sc->offchannel.duration = sc->offchannel.roc_duration; sc->offchannel.duration =
msecs_to_jiffies(sc->offchannel.roc_duration);
sc->offchannel.state = ATH_OFFCHANNEL_ROC_START; sc->offchannel.state = ATH_OFFCHANNEL_ROC_START;
ath_chanctx_offchan_switch(sc, sc->offchannel.roc_chan); ath_chanctx_offchan_switch(sc, sc->offchannel.roc_chan);
} else { } else {
...@@ -959,8 +960,8 @@ static void ath_offchannel_channel_change(struct ath_softc *sc) ...@@ -959,8 +960,8 @@ static void ath_offchannel_channel_change(struct ath_softc *sc)
break; break;
sc->offchannel.state = ATH_OFFCHANNEL_ROC_WAIT; sc->offchannel.state = ATH_OFFCHANNEL_ROC_WAIT;
mod_timer(&sc->offchannel.timer, jiffies + mod_timer(&sc->offchannel.timer,
msecs_to_jiffies(sc->offchannel.duration)); jiffies + sc->offchannel.duration);
ieee80211_ready_on_channel(sc->hw); ieee80211_ready_on_channel(sc->hw);
break; break;
case ATH_OFFCHANNEL_ROC_DONE: case ATH_OFFCHANNEL_ROC_DONE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment