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

Commit f6e8cb72 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: always clear SDATA_STATE_OFFCHANNEL flag 



If the vif is stopped while it is offchannel (e.g. right
after p2p negotiation) the SDATA_STATE_OFFCHANNEL flag
is never get cleared, resulting in various bad effects
(e.g. GO can't start beaconing).

Fix it by clearing the SDATA_STATE_OFFCHANNEL flag
even if the vif is stopped.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b156579b

net/mac80211/offchannel.c

+3 −1
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local, 


	mutex_lock(&local->iflist_mtx);

	list_for_each_entry(sdata, &local->interfaces, list) {

		if (sdata->vif.type != NL80211_IFTYPE_MONITOR)

			clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state);



		if (!ieee80211_sdata_running(sdata))

			continue;
@@ -173,7 +176,6 @@ void ieee80211_offchannel_return(struct ieee80211_local *local, 
		}



		if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {

			clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state);

			/*

			 * This may wake up queues even though the driver

			 * currently has them stopped. This is not very