diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 08:21:00 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:41 -0500 |
commit | af0ed69badc67a0b6e976543f52029fce9ac8f69 (patch) | |
tree | 95f35f3f70f3fd949beda47ad3cee838b0c343c1 /drivers/net/wireless/rt2x00 | |
parent | 9fb04b501a57ad29fa989ab3cd2123482e7eac5f (diff) |
mac80211: stop modifying HT SMPS capability
Instead of modifying the HT SMPS capability field
for stations, track the SMPS mode explicitly in a
new field in the station struct and use it in the
drivers that care about it. This simplifies the
code using it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index f35d85a71bbc..9503e6954b89 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -343,10 +343,7 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
343 | * when using more then one tx stream (>MCS7). | 343 | * when using more then one tx stream (>MCS7). |
344 | */ | 344 | */ |
345 | if (sta && txdesc->u.ht.mcs > 7 && | 345 | if (sta && txdesc->u.ht.mcs > 7 && |
346 | ((sta->ht_cap.cap & | 346 | sta->smps_mode == IEEE80211_SMPS_DYNAMIC) |
347 | IEEE80211_HT_CAP_SM_PS) >> | ||
348 | IEEE80211_HT_CAP_SM_PS_SHIFT) == | ||
349 | WLAN_HT_CAP_SM_PS_DYNAMIC) | ||
350 | __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags); | 347 | __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags); |
351 | } else { | 348 | } else { |
352 | txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs); | 349 | txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs); |