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

Commit 4edac92f authored by David Woodhouse's avatar David Woodhouse Committed by John W. Linville
Browse files

[PATCH] Restore channel setting after scan. 



After a scan, we weren't switching back to the original channel if we
were associated with an AP. So NetworkManager's periodic scans would
disrupt connectivity until the ESSID was manually set again. Fix that.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 93201999

net/ieee80211/softmac/ieee80211softmac_scan.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -232,6 +232,13 @@ void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm) 
	sm->scanning = 0;

	sm->scanning = 0;

	spin_unlock_irqrestore(&sm->lock, flags);

	spin_unlock_irqrestore(&sm->lock, flags);

	

	

	if (sm->associnfo.bssvalid) {

		struct ieee80211softmac_network *net;



		net = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid);

		if (net)

			sm->set_channel(sm->dev, net->channel);

	}

	ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL);

	ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL);

}

}

EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);
 
EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);