summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00config.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/rt2x00config.c
parent1ce9cdac482f0dfbbd22ba4b3e5c016a05543a42 (diff)
downloadkernel-crypto-42c8285767dd17f450d986bdb163a8d56fb0330a.tar.gz
kernel-crypto-42c8285767dd17f450d986bdb163a8d56fb0330a.tar.xz
kernel-crypto-42c8285767dd17f450d986bdb163a8d56fb0330a.zip
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/rt2x00config.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 7c62ce125b9..b3bc8b49be8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -194,6 +194,8 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
rt2x00dev->curr_band = conf->channel->band;
rt2x00dev->tx_power = conf->power_level;
+ rt2x00dev->short_retry = conf->short_frame_max_tx_count;
+ rt2x00dev->long_retry = conf->long_frame_max_tx_count;
rt2x00dev->rx_status.band = conf->channel->band;
rt2x00dev->rx_status.freq = conf->channel->center_freq;