From: Mahesh Palivela <maheshp@posedge.com>
Date: Fri, 10 Aug 2012 16:50:37 +0000 (+0300)
Subject: VHT: Do not allow use of TKIP with VHT
X-Git-Tag: hostap_2_0~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5fd8b18335f2a7784a1f0a5eb5dbe45976d9e21;p=thirdparty%2Fhostap.git

VHT: Do not allow use of TKIP with VHT

Signed-hostap: Mahesh Palivela <maheshp@posedge.com>
---

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index fcbd34fca..8a3da757a 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -778,7 +778,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) &&
+		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,