2 files changed, 12 insertions, 2 deletions

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 1c36c9b4fa4a..eda290fb8bd2 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -209,9 +209,9 @@ minstrel_get_retry_count(struct minstrel_rate *mr,
 {
         unsigned int retry = mr->adjusted_retry_count;
 
-        if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)
+        if (info->control.use_rts)
                 retry = max(2U, min(mr->retry_count_rtscts, retry));
-        else if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
+        else if (info->control.use_cts_prot)
                 retry = max(2U, min(mr->retry_count_cts, retry));
         return retry;
 }
@@ -460,6 +460,8 @@ minstrel_rate_init(void *priv, struct ieee80211_supported_band *sband,
                 } while ((tx_time < mp->segment_size) &&
                                 (++mr->retry_count < mp->max_retry));
                 mr->adjusted_retry_count = mr->retry_count;
+                if (!(sband->bitrates[i].flags & IEEE80211_RATE_ERP_G))
+                        mr->retry_count_cts = mr->retry_count;
         }
 
         for (i = n; i < sband->n_bitrates; i++) {
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 15c1b286e280..6ca857f8f424 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -656,6 +656,9 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                 txrc.rts = rts = true;
         }
 
+        info->control.use_rts = rts;
+        info->control.use_cts_prot = tx->sdata->vif.bss_conf.use_cts_prot;
+
         /*
          * Use short preamble if the BSS can handle it, but not for
          * management frames unless we know the receiver can handle
@@ -766,6 +769,11 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                  */
                 if (rc_rate->flags & IEEE80211_TX_RC_MCS) {
                         WARN_ON(rc_rate->idx > 76);
+
+                        if (!(rc_rate->flags & IEEE80211_TX_RC_USE_RTS_CTS) &&
+                            tx->sdata->vif.bss_conf.use_cts_prot)
+                                rc_rate->flags |=
+                                        IEEE80211_TX_RC_USE_CTS_PROTECT;
                         continue;
                 }