summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00mac.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-14 19:17:54 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-11-01 00:00:14 +0100
commit9124b07740c51cbc6e358dd0c4abc6ee8ded084d (patch)
tree5746885ca90399588f0735aa1a5511648f0be329 /drivers/net/wireless/rt2x00/rt2x00mac.c
parentiwl3945: fix station stuff in RC algorithm (diff)
downloadlinux-9124b07740c51cbc6e358dd0c4abc6ee8ded084d.tar.xz
linux-9124b07740c51cbc6e358dd0c4abc6ee8ded084d.zip
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 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index da7b49a364ff..931183369f07 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -349,6 +349,15 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
return 0;
+ if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
+ rt2x00dev->ops->lib->set_retry_limit(hw,
+ conf->short_frame_max_tx_count,
+ conf->long_frame_max_tx_count);
+ }
+ changed &= ~IEEE80211_CONF_CHANGE_RETRY_LIMITS;
+ if (!changed)
+ return 0;
+
/*
* Only change device state when the radio is enabled. It does not
* matter what parameters we have configured when the radio is disabled