---

yaml --- r: 198601 b: refs/heads/master c: b9f2e39 h: refs/heads/master i: 198599: a19ab40 v: v3
git-mirror · May 21, 2010 · 8bb2371 · 8bb2371
1 parent 15a0928
commit 8bb2371
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 }