Browse Source

ctrl_iface: Check for ongoing sched_scan on SCAN command

The first "if" in the SCAN command handling didn't check properly for
sched_scan, causing the sched_scan and scan to run concurrently, instead
of cancelling the ongoing sched scan (which is handled by the "else if"
later).

Signed-hostap: Eliad Peller <eliad@wizery.com>
Eliad Peller 12 years ago
parent
commit
d125df25e4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      wpa_supplicant/ctrl_iface.c

+ 1 - 1
wpa_supplicant/ctrl_iface.c

@@ -5139,7 +5139,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
 		if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED)
 			reply_len = -1;
 		else {
-			if (!wpa_s->scanning &&
+			if (!wpa_s->sched_scanning && !wpa_s->scanning &&
 			    ((wpa_s->wpa_state <= WPA_SCANNING) ||
 			     (wpa_s->wpa_state == WPA_COMPLETED))) {
 				wpa_s->normal_scans = 0;