summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rt2x00/rt2x00queue.c
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-12-02 18:20:04 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:35:50 -0500
commit42c8285767dd17f450d986bdb163a8d56fb0330a (patch)
treed7c97c2e14faf69a448190c111bb482672a0caf2 /drivers/net/wireless/rt2x00/rt2x00queue.c
parent1ce9cdac482f0dfbbd22ba4b3e5c016a05543a42 (diff)
rt2x00: Store retry limit values
Store retry limit values in the rt2x00dev structure. This allows the removal of the FIXME where we assumed the long retry is only used when working with RTS frames. Instead we should check the current retry limit values and decide if the required retry count for this frame is a long or short retry. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index b8de9d2750e4..7f908a17e368 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -231,14 +231,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
* Determine retry information.
*/
txdesc->retry_limit = tx_info->control.rates[0].count - 1;
- /*
- * XXX: If at this point we knew whether the HW is going to use
- * the RETRY_MODE bit or the retry_limit (currently all
- * use the RETRY_MODE bit) we could do something like b43
- * does, set the RETRY_MODE bit when the RC algorithm is
- * requesting more than the long retry limit.
- */
- if (tx_info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)
+ if (txdesc->retry_limit >= rt2x00dev->long_retry)
__set_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags);
/*