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

Commit 005ba2f1 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville
Browse files

rndis_wlan: clear cfg80211 scan on rndis_wlan_stop() 



Scanning gets stuck if device is stopped when scan is active. Fix by
clearing/aborting cfg80211 scan on rndis_wlan_stop().

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 110736de

drivers/net/wireless/rndis_wlan.c

+8 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,9 @@ static void rndis_get_scan_results(struct work_struct *work) 


	devdbg(usbdev, "get_scan_results");



	if (!priv->scan_request)

		return;



	ret = rndis_check_bssid_list(usbdev);



	cfg80211_scan_done(priv->scan_request, ret < 0);
@@ -2522,6 +2525,11 @@ static int rndis_wlan_stop(struct usbnet *usbdev) 
	cancel_work_sync(&priv->work);

	flush_workqueue(priv->workqueue);



	if (priv->scan_request) {

		cfg80211_scan_done(priv->scan_request, true);

		priv->scan_request = NULL;

	}



	return retval;

}