diff --git a/[refs] b/[refs] index dd28c5a128f6..5bb3893bbea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97b777db57f7226e31a4abd5e69d732037743195 +refs/heads/master: f16f33df4d27f18bc6512dbe83ebbeaa693f0359 diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c index 3e231d756776..a1eed7032c9b 100644 --- a/trunk/net/mac80211/ht.c +++ b/trunk/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;