Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b6308b authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Move roc completion to the offchannel timer 



Currently, when a roc period expires, the offchannel
timer calls ieee80211_remain_on_channel_expired(), but
the roc state is cleared only when the queued work
to switch to the operating channel gets a chance to run.

This race is a problem because mac80211 can issue a
new roc request in this window. To avoid this, handle
roc completion in the offchannel timer itself.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d9092c98

drivers/net/wireless/ath/ath9k/channel.c

+2 −6
Original line number Diff line number Diff line
@@ -926,7 +926,6 @@ void ath_roc_complete(struct ath_softc *sc, bool abort) 


	sc->offchannel.roc_vif = NULL;

	sc->offchannel.roc_chan = NULL;

	if (abort)

	ieee80211_remain_on_channel_expired(sc->hw);

	ath_offchannel_next(sc);

	ath9k_ps_restore(sc);
@@ -1058,10 +1057,8 @@ static void ath_offchannel_timer(unsigned long data) 
		break;

	case ATH_OFFCHANNEL_ROC_START:

	case ATH_OFFCHANNEL_ROC_WAIT:

		ctx = ath_chanctx_get_oper_chan(sc, false);

		sc->offchannel.state = ATH_OFFCHANNEL_ROC_DONE;

		ieee80211_remain_on_channel_expired(sc->hw);

		ath_chanctx_switch(sc, ctx, NULL);

		ath_roc_complete(sc, false);

		break;

	default:

		break;
@@ -1191,7 +1188,6 @@ static void ath_offchannel_channel_change(struct ath_softc *sc) 
		ieee80211_ready_on_channel(sc->hw);

		break;

	case ATH_OFFCHANNEL_ROC_DONE:

		ath_roc_complete(sc, false);

		break;

	default:

		break;