From: Dmitry Shmidt Date: Mon, 14 Nov 2011 23:53:31 +0000 (-0800) Subject: Allow immediate scan request even if another scan was scheduled later X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=194d7af7b31929ccd31f36ff79d55ab1b86220e8;p=thirdparty%2Fhostap.git Allow immediate scan request even if another scan was scheduled later Change-Id: I4f5c021da9ac66464ad422d65c5855fd72f39b41 Signed-off-by: Dmitry Shmidt --- diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index c526e46a4..e953c851e 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -901,6 +901,7 @@ void wpa_supplicant_update_scan_int(struct wpa_supplicant *wpa_s, int sec) */ 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 @@ -923,7 +924,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);