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

Commit 79543d8e authored by David Spinadel's avatar David Spinadel Committed by Johannes Berg
Browse files

mac80211: stop polling in disassociation 



Stop connection monitor poll during disassociation.
This clears the polling flags and if a scan was
deferred it will be run.

Without this fix, if a scan was deferred due to
connection monitoring while disassociation happens,
this scan blocks further scan requests until interface
down/up which causes problems connecting to another AP.

Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 554a43d5

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -1352,6 +1352,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	if (WARN_ON(!ifmgd->associated))

		return;



	ieee80211_stop_poll(sdata);



	memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);



	ifmgd->associated = NULL;
@@ -2612,8 +2614,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u8 frame_buf[DEAUTH_DISASSOC_LEN];



	ieee80211_stop_poll(sdata);



	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,

			       false, frame_buf);

	mutex_unlock(&ifmgd->mtx);