From 9cebf62132309dd6fc867085954854c02139b9ae Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Wed, 11 Feb 2009 22:18:49 +0530
Subject: [PATCH] --- yaml --- r: 134827 b: refs/heads/master c:
 53d6f81c7814690ba096584c733e5deaa34fdd8a h: refs/heads/master i:   134825:
 d94180d975d126e826a5992c3ac66c35b88a76fe   134823:
 473c49ce6586d0931bb9d710da38d1a703a61b94 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3d9d9d8ca124..05920b12b5cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9
+refs/heads/master: 53d6f81c7814690ba096584c733e5deaa34fdd8a
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index fbb766afe599..bf872cbba096 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1528,7 +1528,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 					 elems.wmm_param_len);
 
 	if (elems.ht_info_elem && elems.wmm_param &&
-	    (ifsta->flags & IEEE80211_STA_WMM_ENABLED))
+	    (ifsta->flags & IEEE80211_STA_WMM_ENABLED) &&
+	    !(ifsta->flags & IEEE80211_STA_TKIP_WEP_USED))
 		changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem,
 					       ap_ht_cap_flags);
 
@@ -1954,7 +1955,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 			erp_valid, erp_value);
 
 
-	if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param) {
+	if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param &&
+	    !(ifsta->flags & IEEE80211_STA_TKIP_WEP_USED)) {
 		struct sta_info *sta;
 		struct ieee80211_supported_band *sband;
 		u16 ap_ht_cap_flags;