mac80211: make retry limits part of hw config

Instead of having a separate callback, use the HW config callback
with a new flag to change retry limits.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8bcabefa86e0..dd440a07634e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -505,10 +505,10 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
                                 info->flags |=
                                         IEEE80211_TX_CTL_LONG_RETRY_LIMIT;
                                 info->control.retry_limit =
-                                        tx->local->long_retry_limit;
+                                        tx->local->hw.conf.long_frame_max_tx_count - 1;
                         } else {
                                 info->control.retry_limit =
-                                        tx->local->short_retry_limit;
+                                        tx->local->hw.conf.short_frame_max_tx_count - 1;
                         }
                 } else {
                         info->control.retry_limit = 1;