From: Eliad Peller <eliad@wizery.com>
Date: Thu, 22 Nov 2012 16:06:11 +0000 (+0200)
Subject: wlcore: don't call ieee80211_sched_scan_stopped directly
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=598b262a06235ced311a5327e1fbcedd74da53c9;p=linux-beck.git

wlcore: don't call ieee80211_sched_scan_stopped directly

When we stop sched scan during connection, we shouldn't
call ieee80211_sched_scan_stopped directly, but do it
in the normal flow, as part of the SCHED_SCAN_COMPLETED
event handling.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 11ee7ccbca5f..111b84fcf66e 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -3820,10 +3820,8 @@ static int wlcore_set_bssid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 						wlvif->band);
 
 	/* we only support sched_scan while not connected */
-	if (wl->sched_scanning) {
+	if (wl->sched_scanning)
 		wl1271_scan_sched_scan_stop(wl, wlvif);
-		ieee80211_sched_scan_stopped(wl->hw);
-	}
 
 	ret = wl1271_acx_sta_rate_policies(wl, wlvif);
 	if (ret < 0)