diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-15 13:59:53 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-15 13:59:53 -0500 |
| commit | ded652a67464b1fa66616954bc608ead9ec02fb6 (patch) | |
| tree | 7b4bf1ab3723ed6a906393a5c9f129381cf8e592 /drivers/net/wireless/rt2x00/rt2x00queue.c | |
| parent | b56e681b6210a635af4e4eb93ce81b4654851033 (diff) | |
| parent | 93c78c5debeb9c7101ecc73347d4730c26a98c05 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
| -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 e26ec9d817cf..4d91795dc6a2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
| @@ -354,10 +354,7 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, | |||
| 354 | * when using more then one tx stream (>MCS7). | 354 | * when using more then one tx stream (>MCS7). |
| 355 | */ | 355 | */ |
| 356 | if (sta && txdesc->u.ht.mcs > 7 && | 356 | if (sta && txdesc->u.ht.mcs > 7 && |
| 357 | ((sta->ht_cap.cap & | 357 | sta->smps_mode == IEEE80211_SMPS_DYNAMIC) |
| 358 | IEEE80211_HT_CAP_SM_PS) >> | ||
| 359 | IEEE80211_HT_CAP_SM_PS_SHIFT) == | ||
| 360 | WLAN_HT_CAP_SM_PS_DYNAMIC) | ||
| 361 | __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags); | 358 | __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags); |
| 362 | } else { | 359 | } else { |
| 363 | txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs); | 360 | txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs); |