2 files changed, 8 insertions, 1 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8a086a8ac270..91cee0f0aa71 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -192,9 +192,15 @@ struct ieee80211_tx_control {
 #define IEEE80211_TXCTL_FIRST_FRAGMENT  (1<<8) /* this is a first fragment of
                                                 * the frame */
 #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
+                                                  * using the through
+                                                  * set_retry_limit configured
+                                                  * long retry value */
         u32 flags;                             /* tx control flags defined
                                                 * above */
-        u8 retry_limit;         /* 1 = only first attempt, 2 = one retry, .. */
+        u8 retry_limit;         /* 1 = only first attempt, 2 = one retry, ..
+                                 * This could be used when set_retry_limit
+                                 * is not implemented by the driver */
         u8 power_level;         /* per-packet transmit power level, in dBm */
         u8 antenna_sel_tx;      /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
         s8 key_idx;             /* -1 = do not encrypt, >= 0 keyidx from
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2a1a7d457136..532cf5127b70 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -649,6 +649,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
                 if (tx->skb->len + FCS_LEN > tx->local->rts_threshold &&
                     tx->local->rts_threshold < IEEE80211_MAX_RTS_THRESHOLD) {
                         control->flags |= IEEE80211_TXCTL_USE_RTS_CTS;
+                        control->flags |= IEEE80211_TXCTL_LONG_RETRY_LIMIT;
                         control->retry_limit =
                                 tx->local->long_retry_limit;
                 } else {