From 8bb23719feabcd3688b015a06b3c1c5f628079a9 Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Fri, 14 May 2010 10:46:24 +0300 Subject: [PATCH] --- yaml --- r: 198601 b: refs/heads/master c: b9f2e39d4c2bcd8e94f73ae14450d7764f930a41 h: refs/heads/master i: 198599: a19ab4019733f5abc18a9123c4d91034686d4a52 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_rx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0f071d503cc7..568a05e136ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 073d5eab6fc85b6c278d507a5633b759a85dc878 +refs/heads/master: b9f2e39d4c2bcd8e94f73ae14450d7764f930a41 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c index 57f4bfd959c8..b98fb643fab0 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/trunk/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); }