From ce2edc41f51c15c0eae03d105b0330b4b51bb7cc Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 16 Apr 2013 13:38:43 +0200
Subject: [PATCH] --- yaml --- r: 369586 b: refs/heads/master c:
 991fec091061b901e4fdcc8af4fd25d24a5a7bab h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/include/net/mac80211.h          | 4 +++-
 trunk/net/mac80211/rc80211_minstrel.c | 6 ++++--
 trunk/net/mac80211/tx.c               | 8 ++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2eefbf9f05de..758806a63e16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ffbe6d333664a089f17b13aa79eefe38f794bb7
+refs/heads/master: 991fec091061b901e4fdcc8af4fd25d24a5a7bab
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 05dbb9788504..4f693a5c54de 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -655,7 +655,9 @@ struct ieee80211_tx_info {
 					struct ieee80211_tx_rate rates[
 						IEEE80211_TX_MAX_RATES];
 					s8 rts_cts_rate_idx;
-					/* 3 bytes free */
+					u8 use_rts:1;
+					u8 use_cts_prot:1;
+					/* 2 bytes free */
 				};
 				/* only needed before rate control */
 				unsigned long jiffies;
diff --git a/trunk/net/mac80211/rc80211_minstrel.c b/trunk/net/mac80211/rc80211_minstrel.c
index 1c36c9b4fa4a..eda290fb8bd2 100644
--- a/trunk/net/mac80211/rc80211_minstrel.c
+++ b/trunk/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/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 15c1b286e280..6ca857f8f424 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/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;
 		}