diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-14 21:17:54 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-01 02:00:14 +0300 |
| commit | 9124b07740c51cbc6e358dd0c4abc6ee8ded084d (patch) | |
| tree | 5746885ca90399588f0735aa1a5511648f0be329 /net/mac80211/tx.c | |
| parent | 525181891fb5ed323b6ba0f141c422f1395acfb9 (diff) | |
| download | linux-9124b07740c51cbc6e358dd0c4abc6ee8ded084d.tar.xz | |
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>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
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; |