aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Dutt <usdutt@qti.qualcomm.com>2014-12-17 12:47:10 +0530
committerArne Coucheron <arco68@gmail.com>2015-02-14 12:35:52 +0100
commit03371992806fa5c0c6d1cf090331d9307be566b8 (patch)
tree7c222e93ba776820e76161566f220905267f1171
parent2a291a0714327e1f8c27636e37be7664fa82f663 (diff)
downloadandroid_external_wpa_supplicant_8-03371992806fa5c0c6d1cf090331d9307be566b8.tar.gz
android_external_wpa_supplicant_8-03371992806fa5c0c6d1cf090331d9307be566b8.tar.bz2
android_external_wpa_supplicant_8-03371992806fa5c0c6d1cf090331d9307be566b8.zip
Do not trigger the scan during initialization on Android platforms
Android framework maintains a state to process the scan results after the scan is issued. If wpa_supplicant issues the scan during the initialization, the one issued by the framework may fail (with EBUSY) if the host driver is already processing the scan. Thus, the scan results returned for the first scan triggered by wpa_supplicant are not processed for getting displayed resulting in delay for the display of the first scan results after the Wi-Fi subsystem initialization. Thus, trigger the scan only based on the framework request on Android. CRs-Fixed: 768336 Git-commit: ee82e33d6abdf84cadaa765dadf9e0ec06f5762b Git-repo : git://w1.fi/srv/git/hostap.git Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Change-Id: Ic7fe90cb390a02c5eea1cb21ec74718c257e439d
-rw-r--r--wpa_supplicant/wpa_supplicant.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index e31cc6b4..e9337570 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2768,12 +2768,14 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s)
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
interface_count = 0;
}
+#ifndef ANDROID
if (!wpa_s->p2p_mgmt &&
wpa_supplicant_delayed_sched_scan(wpa_s,
interface_count % 3,
100000))
wpa_supplicant_req_scan(wpa_s, interface_count % 3,
100000);
+#endif /* ANDROID */
interface_count++;
} else
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);