wl12xx: Fix potential incorrect band in rx-status

The rx-status passed to mac80211 along with each received frame contains the
band on which the frame was received. Under certain circumstances, this band
information may be incorrect, causing in worst case a WARNING from mac80211,
and causes the received frame to be dropped.

This scenario mainly occurs when performing connected-mode scans, when the
received scan results are from the other band than the one currently
associated to.

[Since desc_band doesn't exist anymore, use status->band in the later
call to ieee80211_channel_to_frequency() to fix compilation -- Luca]

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c
index 132b0cab56963293f248df50b56268d1f56f52dd..2a581495d5c94f95b414ef165cb6bda1a183fb61 100644 (file)
--- a/drivers/net/wireless/wl12xx/rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -48,18 +48,14 @@ 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;
-
        if ((desc->flags & WL1271_RX_DESC_BAND_MASK) == WL1271_RX_DESC_BAND_BG)
-               desc_band = IEEE80211_BAND_2GHZ;
+               status->band = IEEE80211_BAND_2GHZ;
        else
-               desc_band = IEEE80211_BAND_5GHZ;
+               status->band = IEEE80211_BAND_5GHZ;
 
-       status->rate_idx = wl1271_rate_to_idx(desc->rate, desc_band);
+       status->rate_idx = wl1271_rate_to_idx(desc->rate, status->band);
 
 #ifdef CONFIG_WL12XX_HT
        /* 11n support */
@@ -76,7 +72,8 @@ static void wl1271_rx_status(struct wl1271 *wl,
         */
        wl->noise = desc->rssi - (desc->snr >> 1);
 
-       status->freq = ieee80211_channel_to_frequency(desc->channel, desc_band);
+       status->freq = ieee80211_channel_to_frequency(desc->channel,
+                                                     status->band);
 
        if (desc->flags & WL1271_RX_DESC_ENCRYPT_MASK) {
                status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;