wlcore: don't call ieee80211_sched_scan_stopped directly
authorEliad Peller <eliad@wizery.com>
Thu, 22 Nov 2012 16:06:11 +0000 (18:06 +0200)
committerLuciano Coelho <coelho@ti.com>
Tue, 27 Nov 2012 08:49:25 +0000 (10:49 +0200)
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>
drivers/net/wireless/ti/wlcore/main.c

index 11ee7ccbca5fc61e0d712502ab12b678be6bcdef..111b84fcf66e33ba8fd421ab784559a2c2fe812c 100644 (file)
@@ -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)