1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00ht.c b/drivers/net/wireless/rt2x00/rt2x00ht.c
index ad3c7ff4837b..c637bcaec5f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00ht.c
+++ b/drivers/net/wireless/rt2x00/rt2x00ht.c
@@ -60,9 +60,10 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
                  * when using more then one tx stream (>MCS7).
                  */
                 if (tx_info->control.sta && txdesc->mcs > 7 &&
-                    (tx_info->control.sta->ht_cap.cap &
-                     (WLAN_HT_CAP_SM_PS_DYNAMIC <<
-                      IEEE80211_HT_CAP_SM_PS_SHIFT)))
+                    ((tx_info->control.sta->ht_cap.cap &
+                      IEEE80211_HT_CAP_SM_PS) >>
+                     IEEE80211_HT_CAP_SM_PS_SHIFT) ==
+                    WLAN_HT_CAP_SM_PS_DYNAMIC)
                         __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags);
         } else {
                 txdesc->mcs = rt2x00_get_rate_mcs(hwrate->mcs);
@@ -72,9 +73,11 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
 
 
         /*
-         * Convert flags
+         * This frame is eligible for an AMPDU, however, don't aggregate
+         * frames that are intended to probe a specific tx rate.
          */
-        if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
+        if (tx_info->flags & IEEE80211_TX_CTL_AMPDU &&
+            !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
                 __set_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags);
 
         /*
@@ -84,7 +87,13 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
                 txdesc->rate_mode = RATE_MODE_HT_MIX;
         if (txrate->flags & IEEE80211_TX_RC_GREEN_FIELD)
                 txdesc->rate_mode = RATE_MODE_HT_GREENFIELD;
-        if (txrate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+
+        /*
+         * Set 40Mhz mode if necessary (for legacy rates this will
+         * duplicate the frame to both channels).
+         */
+        if (txrate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH ||
+            txrate->flags & IEEE80211_TX_RC_DUP_DATA)
                 __set_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags);
         if (txrate->flags & IEEE80211_TX_RC_SHORT_GI)
                 __set_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags);