jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Invoke connect work done for all the connection failure cases

Browse source 
This commit fixes couple of connection failure paths where
wpas_connect_work_done() was not called, thus enabling the radio work
interface to proceed with the other queued actions.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Sunil Dutt 2014-10-20 10:18:47 +05:30 committed by Jouni Malinen
parent 76d81b3272
commit 7465640066
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wpa_supplicant/wpa_supplicant.c
View file

@ -1640,6 +1640,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
(ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
/* Use ap_scan==1 style network selection to find the network
*/
wpas_connect_work_done(wpa_s);
wpa_s->scan_req = MANUAL_SCAN_REQ;
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
@ -1690,6 +1691,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
wpa_ie, &wpa_ie_len)) {
wpa_msg(wpa_s, MSG_WARNING, "WPA: Failed to set WPA "
"key management and encryption suites");
wpas_connect_work_done(wpa_s);
return;
}
} else if ((ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) && bss &&
@ -1709,6 +1711,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
wpa_msg(wpa_s, MSG_WARNING, "WPA: Failed to set WPA "
"key management and encryption suites (no "
"scan results)");
wpas_connect_work_done(wpa_s);
return;
}
#ifdef CONFIG_WPS
@ -1994,8 +1997,10 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
"Assoc conflicting freq found (%d != %d)",
freq, params.freq.freq);
if (wpas_p2p_handle_frequency_conflicts(
wpa_s, params.freq.freq, ssid) < 0)
wpa_s, params.freq.freq, ssid) < 0) {
wpas_connect_work_done(wpa_s);
return;
}
}
}
#endif /* CONFIG_P2P */