aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-06-25 14:27:21 +0300
committerArik Nemtsov <arik@wizery.com>2012-08-02 13:04:00 +0300
commit4bf8943e7319ecbe3964ace8c8664fb5e7b15470 (patch)
tree4db575c969f36bbf39b8c92743567af6e011ba2d
parentd74d7b325b4856867c443202d97ebe0eea838714 (diff)
downloadexternal_wpa_supplicant_8_ti-4bf8943e7319ecbe3964ace8c8664fb5e7b15470.zip
external_wpa_supplicant_8_ti-4bf8943e7319ecbe3964ace8c8664fb5e7b15470.tar.gz
external_wpa_supplicant_8_ti-4bf8943e7319ecbe3964ace8c8664fb5e7b15470.tar.bz2
wpa_supplicant: delay scans only for android builds (INTERNAL)
commit e48cd17 ("android: Delay scan after startup to prevent race with framework (INTERNAL)") is fixing some bug wrt. android framework, but introduce pretty annoying delay when working with native linux. Surround the new functionality with ifdefs in order to apply it only for android build. Signed-off-by: Eliad Peller <eliad@wizery.com>
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 5797faa..46b7296 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2347,7 +2347,11 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s)
wpa_s->prev_scan_wildcard = 0;
if (wpa_supplicant_enabled_networks(wpa_s)) {
+#ifdef ANDROID
wpa_supplicant_req_scan(wpa_s, wpa_s->scan_interval, 0);
+#else
+ wpa_supplicant_req_scan(wpa_s, interface_count, 100000);
+#endif
interface_count++;
} else
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);