From fa58da2e6ce76939ced1abd61625cbc92f8fd109 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 17 Nov 2013 12:52:08 +0200 Subject: [PATCH] Remove old mechanism of skipping scan request rescheduling Since eloop_deplete_timeout() is doing practically same in wpa_supplicant_req_scan(), revert the old mechanism from commit 7e1488494e0150ee7fdef83355266b5633c5c1b0 to avoid unnecessary work in this function. Signed-hostap: Jouni Malinen --- wpa_supplicant/scan.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 47827f442..6d679d2c4 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -914,29 +914,6 @@ void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec) return; } - /* 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 - * causes the specific SSID scan to get continually pushed back and - * never happen, which causes hidden APs to never get probe-scanned. - */ - if (eloop_is_timeout_registered(wpa_supplicant_scan, wpa_s, NULL) && - wpa_s->conf->ap_scan == 1) { - struct wpa_ssid *ssid = wpa_s->conf->ssid; - - while (ssid) { - if (!wpas_network_disabled(wpa_s, ssid) && - ssid->scan_ssid) - break; - ssid = ssid->next; - } - if (ssid) { - wpa_dbg(wpa_s, MSG_DEBUG, "Not rescheduling scan to " - "ensure that specific SSID scans occur"); - return; - } - } - wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d sec %d usec", sec, usec); eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);