From: Sujith <Sujith.Manoharan@atheros.com>
Date: Fri, 14 Nov 2008 10:57:53 +0000 (+0530)
Subject: mac80211: Use the HT capabilities from the IE instead of the station's caps.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f16f33df4d27f18bc6512dbe83ebbeaa693f0359;p=deliverable%2Flinux.git

mac80211: Use the HT capabilities from the IE instead of the station's caps.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 3e231d756776..a1eed7032c9b 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -36,7 +36,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,
 
 	ht_cap->ht_supported = true;
 
-	ht_cap->cap = ht_cap->cap & sband->ht_cap.cap;
+	ht_cap->cap = le16_to_cpu(ht_cap_ie->cap_info) & sband->ht_cap.cap;
 	ht_cap->cap &= ~IEEE80211_HT_CAP_SM_PS;
 	ht_cap->cap |= sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS;