diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-11-14 05:57:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:36 -0500 |
commit | f16f33df4d27f18bc6512dbe83ebbeaa693f0359 (patch) | |
tree | d1347daa961376a7588be9f9cce6435fc698b421 /net/mac80211/ht.c | |
parent | 97b777db57f7226e31a4abd5e69d732037743195 (diff) |
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>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r-- | net/mac80211/ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 3e231d75677..a1eed7032c9 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, | |||
36 | 36 | ||
37 | ht_cap->ht_supported = true; | 37 | ht_cap->ht_supported = true; |
38 | 38 | ||
39 | ht_cap->cap = ht_cap->cap & sband->ht_cap.cap; | 39 | ht_cap->cap = le16_to_cpu(ht_cap_ie->cap_info) & sband->ht_cap.cap; |
40 | ht_cap->cap &= ~IEEE80211_HT_CAP_SM_PS; | 40 | ht_cap->cap &= ~IEEE80211_HT_CAP_SM_PS; |
41 | ht_cap->cap |= sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS; | 41 | ht_cap->cap |= sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS; |
42 | 42 | ||