From patchwork Fri Aug 10 22:45:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] AP: fix erroneous "station tried TKIP" error From: Christian Lamparter X-Patchwork-Id: 176646 Message-Id: <201208110045.40554.chunkeey@googlemail.com> To: hostap@lists.shmoo.com Cc: j@w1.fi Date: Sat, 11 Aug 2012 00:45:40 +0200 The commit b5fd8b18335f2a7784a1f0a5eb5dbe45976d9e21 "VHT: Do not allow use of TKIP with VHT" introduced an off-by-one regression: a WPA/RSN 11n ap would no longer accept stations to connect, instead it would produce a bogus error message: ... Station tried to use TKIP with HT association. Cc: Mahesh Palivela Signed-hostapd: Christian Lamparter --- This time, I got the right commit-id (the one which broke the code) and just for good measure: a reworded commit message. Regards, Chr --- src/ap/ieee802_11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,