summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-08-23 15:56:23 +0300
committerLuciano Coelho <coelho@ti.com>2011-08-25 10:19:28 +0300
commit53835a2d19f533acb0de2466d1ece7b673556419 (patch)
treea4d5c8b966cd1fea455b503fc4e06f97ec0a2e7e /drivers/net/wireless/wl12xx/main.c
parentcabb81c9a8d8dd7e5f220244246332ab24ef6d80 (diff)
downloadblackbird-op-linux-53835a2d19f533acb0de2466d1ece7b673556419.tar.gz
blackbird-op-linux-53835a2d19f533acb0de2466d1ece7b673556419.zip
wl12xx: initialize rate_set on band rates initialization
In some corner cases, (invalid) 11g rates were used while working on 11a band. Take care of it by initializing rate_set according to the configured band. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r--drivers/net/wireless/wl12xx/main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 20e7bc78a7fe..3702e61a89f6 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2200,10 +2200,14 @@ out:
static void wl1271_set_band_rate(struct wl1271 *wl)
{
- if (wl->band == IEEE80211_BAND_2GHZ)
+ if (wl->band == IEEE80211_BAND_2GHZ) {
wl->basic_rate_set = wl->conf.tx.basic_rate;
- else
+ wl->rate_set = wl->conf.tx.basic_rate;
+ } else {
wl->basic_rate_set = wl->conf.tx.basic_rate_5;
+ wl->rate_set = wl->conf.tx.basic_rate_5;
+ }
+
}
static bool wl12xx_is_roc(struct wl1271 *wl)
OpenPOWER on IntegriCloud