summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti
diff options
context:
space:
mode:
authorBarak Bercovitz <barak@wizery.com>2014-02-10 13:47:27 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-02-13 15:20:15 -0500
commit5a441f5ff75daf9c3c6657a66e2806a1255f5b84 (patch)
tree7e1a5c67238598deeb98b236089e86fa3cd015d5 /drivers/net/wireless/ti
parent2a5ad92e271e518281504eeeab1dd311351ff7b7 (diff)
downloadblackbird-op-linux-5a441f5ff75daf9c3c6657a66e2806a1255f5b84.tar.gz
blackbird-op-linux-5a441f5ff75daf9c3c6657a66e2806a1255f5b84.zip
wlcore: don't stop sched_scan on interface removal
Stopping sched scan on interface removal (during recovery) is no longer needed, as sched scanning is automatically restarted by mac80211. Signed-off-by: Barak Bercovitz <barak@wizery.com> Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 73bf251aeaa4..bea2938ebbc8 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -2582,10 +2582,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
ieee80211_scan_completed(wl->hw, true);
}
- if (wl->sched_vif == wlvif) {
- ieee80211_sched_scan_stopped(wl->hw);
+ if (wl->sched_vif == wlvif)
wl->sched_vif = NULL;
- }
if (wl->roc_vif == vif) {
wl->roc_vif = NULL;
OpenPOWER on IntegriCloud