Commit b4b177a5 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix on-channel remain-on-channel 



Jouni reported that if a remain-on-channel was active on the
same channel as the current operating channel, then the ROC
would start, but any frames transmitted using mgmt-tx on the
same channel would get delayed until after the ROC.

The reason for this is that the ROC starts, but doesn't have
any handling for "remain on the same channel", so it stops
the interface queues. The later mgmt-tx then puts the frame
on the interface queues (since it's on the current operating
channel) and thus they get delayed until after the ROC.

To fix this, add some logic to handle remaining on the same
channel specially and not stop the queues etc. in this case.
This not only fixes the bug but also improves behaviour in
this case as data frames etc. can continue to flow.

Cc: stable@vger.kernel.org
Reported-by: default avatarJouni Malinen <j@w1.fi>
Tested-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f5651986

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ struct ieee80211_roc_work { 


	bool started, abort, hw_begun, notified;

	bool to_be_freed;

	bool on_channel;



	unsigned long hw_start_time;

net/mac80211/offchannel.c

+20 −7
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) 
		container_of(work, struct ieee80211_roc_work, work.work);

	struct ieee80211_sub_if_data *sdata = roc->sdata;

	struct ieee80211_local *local = sdata->local;

	bool started;

	bool started, on_channel;



	mutex_lock(&local->mtx);
@@ -354,14 +354,26 @@ void ieee80211_sw_roc_work(struct work_struct *work) 
	if (!roc->started) {

		struct ieee80211_roc_work *dep;



		/* start this ROC */

		ieee80211_offchannel_stop_vifs(local);

		WARN_ON(local->use_chanctx);



		/* If actually operating on the desired channel (with at least

		 * 20 MHz channel width) don't stop all the operations but still

		 * treat it as though the ROC operation started properly, so

		 * other ROC operations won't interfere with this one.

		 */

		roc->on_channel = roc->chan == local->_oper_chandef.chan &&

				  local->_oper_chandef.width != NL80211_CHAN_WIDTH_5 &&

				  local->_oper_chandef.width != NL80211_CHAN_WIDTH_10;



		/* switch channel etc */

		/* start this ROC */

		ieee80211_recalc_idle(local);



		if (!roc->on_channel) {

			ieee80211_offchannel_stop_vifs(local);



			local->tmp_channel = roc->chan;

			ieee80211_hw_config(local, 0);

		}



		/* tell userspace or send frame */

		ieee80211_handle_roc_started(roc);
@@ -380,9 +392,10 @@ void ieee80211_sw_roc_work(struct work_struct *work) 
 finish:

		list_del(&roc->list);

		started = roc->started;

		on_channel = roc->on_channel;

		ieee80211_roc_notify_destroy(roc, !roc->abort);



		if (started) {

		if (started && !on_channel) {

			ieee80211_flush_queues(local, NULL);



			local->tmp_channel = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE