diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2009-07-30 12:41:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:44:16 -0400 |
commit | 005ba2f17e68b4da6a2c2c01c826294beac50415 (patch) | |
tree | e92bd381f1ca1d54ac04091e32e06e0dd0dfa37b /drivers/net | |
parent | 110736de938b5bfdd63c86166e355d3f16115f6a (diff) |
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: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 3c7c620c4f07..dee05511d591 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -1484,6 +1484,9 @@ static void rndis_get_scan_results(struct work_struct *work) | |||
1484 | 1484 | ||
1485 | devdbg(usbdev, "get_scan_results"); | 1485 | devdbg(usbdev, "get_scan_results"); |
1486 | 1486 | ||
1487 | if (!priv->scan_request) | ||
1488 | return; | ||
1489 | |||
1487 | ret = rndis_check_bssid_list(usbdev); | 1490 | ret = rndis_check_bssid_list(usbdev); |
1488 | 1491 | ||
1489 | cfg80211_scan_done(priv->scan_request, ret < 0); | 1492 | cfg80211_scan_done(priv->scan_request, ret < 0); |
@@ -2522,6 +2525,11 @@ static int rndis_wlan_stop(struct usbnet *usbdev) | |||
2522 | cancel_work_sync(&priv->work); | 2525 | cancel_work_sync(&priv->work); |
2523 | flush_workqueue(priv->workqueue); | 2526 | flush_workqueue(priv->workqueue); |
2524 | 2527 | ||
2528 | if (priv->scan_request) { | ||
2529 | cfg80211_scan_done(priv->scan_request, true); | ||
2530 | priv->scan_request = NULL; | ||
2531 | } | ||
2532 | |||
2525 | return retval; | 2533 | return retval; |
2526 | } | 2534 | } |
2527 | 2535 | ||