diff options
| author |   Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-05-14 10:46:24 +0300 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-05-21 14:40:00 -0400 |
| commit | b9f2e39d4c2bcd8e94f73ae14450d7764f930a41 (patch) | |
| tree | 158f83d8456cb7ad7899cee2bdceaa9ad512577a /drivers/net/wireless | |
| parent | iwlwifi: fix internal scan race (diff) | |
| download | linux-dev-b9f2e39d4c2bcd8e94f73ae14450d7764f930a41.tar.xz linux-dev-b9f2e39d4c2bcd8e94f73ae14450d7764f930a41.zip | |
wl1271: Fix RX data path frame lengths
The current frame length used by the driver for RX frames is the SPI bus
transfer length. This length has padding bytes, which do not belong to the
WLAN frame.
As there is no other length information in the WLAN frame except the skb
length this problem caused for instance extra ESSID's to be listed at the
end of scan results (IE id 0) with zero length.
Fix the frame length by removing padding.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_rx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c index 57f4bfd959c8..b98fb643fab0 100644 --- a/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/drivers/net/wireless/wl12xx/wl1271_rx.c @@ -113,6 +113,8 @@ static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length) wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s", skb, skb->len, beacon ? "beacon" : ""); + skb_trim(skb, skb->len - desc->pad_len); + memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status)); ieee80211_rx_ni(wl->hw, skb); } |