WPS: Start EAPOL immediately even without WPA on WPS association

Previously, the immediate EAPOL authenticator startup was scheduled
without having received EAPOL-Start only for the case where WPA/WPA2 was
enabled. This can be extended to speed up non-WPA/WPA2 cases as well if
the STA includes WPS IE in Association Request frame.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index 84a98abc48232dbaef701da1390cdd819b4cedfa..86e07e99cc6d48a2578543aba3a3a0fbd11a5257 100644 (file)
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -1021,8 +1021,9 @@ void ieee802_1x_new_station(struct hostapd_data *hapd, struct sta_info *sta)
        int key_mgmt;
 
 #ifdef CONFIG_WPS
-       if (hapd->conf->wps_state && hapd->conf->wpa &&
-           (sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS))) {
+       if (hapd->conf->wps_state &&
+           ((hapd->conf->wpa && (sta->flags & WLAN_STA_MAYBE_WPS)) ||
+            (sta->flags & WLAN_STA_WPS))) {
                /*
                 * Need to enable IEEE 802.1X/EAPOL state machines for possible
                 * WPS handshake even if IEEE 802.1X/EAPOL is not used for