diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-10-11 11:57:39 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-11-08 15:36:45 +0200 |
| commit | d6fa37c9ffa2a613943dd1c32f220a3e6e9eb77c (patch) | |
| tree | 3453f1be4c4342fb2be157c03f688003724f653d /drivers/net/wireless/wl12xx | |
| parent | 679a673414473239d189b5b41ea4014b088be7b9 (diff) | |
| download | blackbird-obmc-linux-d6fa37c9ffa2a613943dd1c32f220a3e6e9eb77c.tar.gz blackbird-obmc-linux-d6fa37c9ffa2a613943dd1c32f220a3e6e9eb77c.zip | |
wl12xx: reconfigure rate policies on set_bitrate_mask
The rate policies are configured only after association,
resulting in auth req being sent in wrong rates.
Reconfigure rate policies on bitrate mask change.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 44070e66cfed..c05be03907e4 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -4318,7 +4318,7 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw, { struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); struct wl1271 *wl = hw->priv; - int i; + int i, ret = 0; wl1271_debug(DEBUG_MAC80211, "mac80211 set_bitrate_mask 0x%x 0x%x", mask->control[NL80211_BAND_2GHZ].legacy, @@ -4331,9 +4331,28 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw, wl1271_tx_enabled_rates_get(wl, mask->control[i].legacy, i); + + if (unlikely(wl->state == WL1271_STATE_OFF)) + goto out; + + if (wlvif->bss_type == BSS_TYPE_STA_BSS && + !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { + + ret = wl1271_ps_elp_wakeup(wl); + if (ret < 0) + goto out; + + wl1271_set_band_rate(wl, wlvif); + wlvif->basic_rate = + wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set); + ret = wl1271_acx_sta_rate_policies(wl, wlvif); + + wl1271_ps_elp_sleep(wl); + } +out: mutex_unlock(&wl->mutex); - return 0; + return ret; } static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, |
