aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/scan.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-11-14 15:53:31 -0800
committerDmitry Shmidt <dimitrysh@google.com>2011-11-14 15:53:31 -0800
commit81e9700b8fb135b898181ad3aeb44d39f0a01907 (patch)
treef06319320d8b3db0dc5b332c88fa6b92f5a63839 /wpa_supplicant/scan.c
parent95613e49a5d2b830b45757efdb7144fd668f23ae (diff)
downloadexternal_wpa_supplicant_8-81e9700b8fb135b898181ad3aeb44d39f0a01907.zip
external_wpa_supplicant_8-81e9700b8fb135b898181ad3aeb44d39f0a01907.tar.gz
external_wpa_supplicant_8-81e9700b8fb135b898181ad3aeb44d39f0a01907.tar.bz2
Allow immediate scan request even if another scan was scheduled later
Change-Id: I4f5c021da9ac66464ad422d65c5855fd72f39b41 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/scan.c')
-rw-r--r--wpa_supplicant/scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 69fa99f..bb64e9a 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -504,6 +504,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
*/
void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
{
+#ifndef ANDROID
/* If there's at least one network that should be specifically scanned
* then don't cancel the scan and reschedule. Some drivers do
* background scanning which generates frequent scan results, and that
@@ -525,7 +526,7 @@ void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
return;
}
}
-
+#endif
wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d sec %d usec",
sec, usec);
eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);