Restore scan request settings if initial association failed

The scan path to initiate another scan if the initial association failed
was broken due to wpa_s->scan_req being zeroed earlier in
wpa_supplicant_scan(). This caused the second scan to bail out early
since it thought this was not a requested scan.

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index c2549e2..8767109 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -137,6 +137,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
        if (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
            !wpa_s->use_client_mlme) {
                wpa_s->scan_res_tried++;
+               wpa_s->scan_req = scan_req;
                wpa_printf(MSG_DEBUG, "Trying to get current scan results "
                           "first without requesting a new scan to speed up "
                           "initial association");