From 80d5a3db9a3e483289d45e4121528e3373a07fd1 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 8 Dec 2014 01:25:26 +0200 Subject: [PATCH] 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 --- src/ap/ieee802_1x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c index 84a98abc4..86e07e99c 100644 --- 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