From: Sujith Manoharan Date: Fri, 5 Sep 2014 04:20:56 +0000 (+0530) Subject: ath9k: Fix offchannel operation X-Git-Tag: firefly_0821_release~176^2~3001^2~75^2~173 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=da0162f3f0012465cc6d77c4d416fabb182713ad;p=firefly-linux-kernel-4.4.55.git ath9k: Fix offchannel operation When multiple channel contexts are active, an offchannel request will not be handled immediately, but will be queued to be handled later. But, currently, the channel definition is not copied to the local offchannel state. This breaks operation like scanning when MCC is active. Fix this by storing the offchannel parameters properly. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c index e73d305ea1e4..a31f526ba852 100644 --- a/drivers/net/wireless/ath/ath9k/channel.c +++ b/drivers/net/wireless/ath/ath9k/channel.c @@ -588,7 +588,11 @@ static void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx, if (test_bit(ATH_OP_MULTI_CHANNEL, &common->op_flags) && (sc->cur_chan != ctx) && (ctx == &sc->offchannel.chan)) { sc->sched.offchannel_pending = true; + if (chandef) + ctx->chandef = *chandef; spin_unlock_bh(&sc->chan_lock); + ath_dbg(common, CHAN_CTX, + "Set offchannel_pending to true\n"); return; }