From: Johannes Berg Date: Thu, 27 Mar 2014 14:39:20 +0000 (+0100) Subject: mac80211: fix software remain-on-channel implementation X-Git-Tag: firefly_0821_release~3679^2~2360 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=007058ac423d001c996682baf10fed481186df37;p=firefly-linux-kernel-4.4.55.git mac80211: fix software remain-on-channel implementation commit 115b943a6ea12656088fa1ff6634c0d30815e55b upstream. Jouni reported that when doing off-channel transmissions mixed with on-channel transmissions, the on-channel ones ended up on the off-channel in some cases. The reason for that is that during the refactoring of the off- channel code, I lost the part that stopped all activity and as a consequence the on-channel frames (including data frames) were no longer queued but would be transmitted on the temporary channel. Fix this by simply restoring the lost activity stop call. Fixes: 2eb278e083549 ("mac80211: unify SW/offload remain-on-channel") Reported-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index acd1f71adc03..11d3f227e11e 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -355,6 +355,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) struct ieee80211_roc_work *dep; /* start this ROC */ + ieee80211_offchannel_stop_vifs(local); /* switch channel etc */ ieee80211_recalc_idle(local);