diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-25 13:15:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-25 13:15:11 -0700 |
| commit | a261af927df64523925c98369106de15af9d7b5e (patch) | |
| tree | 3c8fb8be59b8a4733eb5b63ecf567976185c9f58 /drivers/net/wireless/wl12xx/wl1271_rx.c | |
| parent | acfbe96a3035639619a6533e04d88ed4ef9ccb61 (diff) | |
| parent | a65e4cb402b5f3e120570ba1faca4354d47e8f2f (diff) | |
| download | blackbird-op-linux-a261af927df64523925c98369106de15af9d7b5e.tar.gz blackbird-op-linux-a261af927df64523925c98369106de15af9d7b5e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_rx.c')
| -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); } |
