Do not trigger initial scan if there are no enabled networks
authorJouni Malinen <jouni.malinen@atheros.com>
Fri, 16 Apr 2010 15:56:23 +0000 (18:56 +0300)
committerJouni Malinen <j@w1.fi>
Fri, 16 Apr 2010 15:56:23 +0000 (18:56 +0300)
This allows wpa_supplicant to be started quickly with an empty
configuration. If an external program wants to fetch scan results
from wpa_supplicant, it will need to request a scan explicitly
in this type of case.

wpa_supplicant/wpa_supplicant.c

index 9b6efdb..01e89df 100644 (file)
@@ -1836,8 +1836,11 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s)
        wpa_drv_flush_pmkid(wpa_s);
 
        wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
-       wpa_supplicant_req_scan(wpa_s, interface_count, 100000);
-       interface_count++;
+       if (wpa_supplicant_enabled_networks(wpa_s->conf)) {
+               wpa_supplicant_req_scan(wpa_s, interface_count, 100000);
+               interface_count++;
+       } else
+               wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
 
        return 0;
 }