WPS: Extend startWhen to 2 if peer AP supports WPS 2.0
Increase EAPOL startWhen to 2 for the case where the AP/GO has advertised it supports WPS 2.0. This is done to make it less likely for the EAPOL-Start frame to be sent out since that is only required for WPS 1.0. Not sending it can remove one unnecessary round trip from the EAP exchange when the AP is going to start with EAP-Request/Identity immediately based on the Association Request frame. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
parent
a87e123a96
commit
3f7ac05878
3 changed files with 21 additions and 2 deletions
|
@ -255,7 +255,7 @@ SM_STATE(SUPP_PAE, CONNECTING)
|
|||
* delay authentication. Use a short timeout to send the first
|
||||
* EAPOL-Start if Authenticator does not start authentication.
|
||||
*/
|
||||
if (sm->conf.wps) {
|
||||
if (sm->conf.wps && !(sm->conf.wps & EAPOL_PEER_IS_WPS20_AP)) {
|
||||
/* Reduce latency on starting WPS negotiation. */
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"EAPOL: Using shorter startWhen for WPS");
|
||||
|
|
|
@ -59,6 +59,8 @@ struct eapol_config {
|
|||
*/
|
||||
int external_sim;
|
||||
|
||||
#define EAPOL_LOCAL_WPS_IN_USE BIT(0)
|
||||
#define EAPOL_PEER_IS_WPS20_AP BIT(1)
|
||||
/**
|
||||
* wps - Whether this connection is used for WPS
|
||||
*/
|
||||
|
|
|
@ -297,7 +297,24 @@ void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
|
|||
wpa_s->key_mgmt != WPA_KEY_MGMT_IEEE8021X_NO_WPA &&
|
||||
wpa_s->key_mgmt != WPA_KEY_MGMT_WPS;
|
||||
eapol_conf.external_sim = wpa_s->conf->external_sim;
|
||||
eapol_conf.wps = wpa_s->key_mgmt == WPA_KEY_MGMT_WPS;
|
||||
|
||||
#ifdef CONFIG_WPS
|
||||
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS) {
|
||||
eapol_conf.wps |= EAPOL_LOCAL_WPS_IN_USE;
|
||||
if (wpa_s->current_bss) {
|
||||
struct wpabuf *ie;
|
||||
ie = wpa_bss_get_vendor_ie_multi(wpa_s->current_bss,
|
||||
WPS_IE_VENDOR_TYPE);
|
||||
if (ie) {
|
||||
if (wps_is_20(ie))
|
||||
eapol_conf.wps |=
|
||||
EAPOL_PEER_IS_WPS20_AP;
|
||||
wpabuf_free(ie);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_WPS */
|
||||
|
||||
eapol_sm_notify_config(wpa_s->eapol, &ssid->eap, &eapol_conf);
|
||||
|
||||
ieee802_1x_alloc_kay_sm(wpa_s, ssid);
|
||||
|
|
Loading…
Reference in a new issue