diff options
| author | Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> | 2010-10-14 11:00:04 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:25:13 -0500 |
| commit | 6a2de93b2553c2e9a72997370534993c85c1eee6 (patch) | |
| tree | b85bc95b457754514cd59454056ba3b8737c45b0 /drivers/net/wireless/wl12xx/wl1271_rx.c | |
| parent | 18357850b694ba3fa29363c7d86ccd8783f4a065 (diff) | |
| download | linux-6a2de93b2553c2e9a72997370534993c85c1eee6.tar.gz linux-6a2de93b2553c2e9a72997370534993c85c1eee6.tar.bz2 linux-6a2de93b2553c2e9a72997370534993c85c1eee6.zip | |
wl1271: Fix warning about unsupported RX rate
While scanning, it is possible that beacon and probe response frames are
received on other band than configured to the driver. In rx status
handling this has caused "Unsupported RX rate from HW" warnings. This
patch changes the wl1271_rate_to_index function to take the band of the
received frame as a parameter instead of using value configuret to
wl->band.
Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_rx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_rx.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c index ac13f7d25219..35448e7c0dd5 100644 --- a/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/drivers/net/wireless/wl12xx/wl1271_rx.c @@ -48,10 +48,18 @@ static void wl1271_rx_status(struct wl1271 *wl, struct ieee80211_rx_status *status, u8 beacon) { + enum ieee80211_band desc_band; + memset(status, 0, sizeof(struct ieee80211_rx_status)); status->band = wl->band; - status->rate_idx = wl1271_rate_to_idx(wl, desc->rate); + + if ((desc->flags & WL1271_RX_DESC_BAND_MASK) == WL1271_RX_DESC_BAND_BG) + desc_band = IEEE80211_BAND_2GHZ; + else + desc_band = IEEE80211_BAND_5GHZ; + + status->rate_idx = wl1271_rate_to_idx(desc->rate, desc_band); #ifdef CONFIG_WL1271_HT /* 11n support */ |