Patchwork AP: fix erroneous "station tried TKIP" error

login
register
mail settings
Submitter Christian Lamparter
Date Aug. 10, 2012, 10:01 p.m.
Message ID <E1SzxLs-00083A-RK@debian64.localnet>
Download mbox | patch
Permalink /patch/176636/
State Superseded
Headers show

Comments

Christian Lamparter - Aug. 10, 2012, 10:01 p.m.
The commit 140e850a66fdbc705c63befb6a49a1ad6058b146
"VHT: Add option for requiring use of VHT" introduced
a small regression where a normal 11n ap would no
longer accept a station if it was configured to
be protected by WPA/RSN.

Cc: Mahesh Palivela <maheshp@posedge.com>
Signed-hostapd: Christian Lamparter <chunkeey@googlemail.com>
---
 src/ap/ieee802_11.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index dedf72a..537b555 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -785,7 +785,7 @@  static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
 #endif /* CONFIG_IEEE80211R */
 
 #ifdef CONFIG_IEEE80211N
-		if ((sta->flags & (WLAN_STA_HT | WLAN_STA_VHT)) ||
+		if ((sta->flags & (WLAN_STA_HT | WLAN_STA_VHT)) &&
 		    wpa_auth_get_pairwise(sta->wpa_sm) == WPA_CIPHER_TKIP) {
 			hostapd_logger(hapd, sta->addr,
 				       HOSTAPD_MODULE_IEEE80211,