From c0c91d4adc335aef443179aa785af0928453e297 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 28 Feb 2013 07:16:54 +0000
Subject: [PATCH] --- yaml --- r: 360791 b: refs/heads/master c:
 02e711276d444343656c25b91b42996c62726712 h: refs/heads/master i:   360789:
 b0a0d162229f1c42c00605de92217446460f2ab5   360787:
 85ba58326f0d95cb177d603e895abf151676757c   360783:
 159e91fd1e3472ae3396b70942422621b2930336 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/broadcom/bgmac.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1ce509cb385..960b24ebf319 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a431915d19893f047e0dd149d0c1b9d2a0b960
+refs/heads/master: 02e711276d444343656c25b91b42996c62726712
diff --git a/trunk/drivers/net/ethernet/broadcom/bgmac.c b/trunk/drivers/net/ethernet/broadcom/bgmac.c
index bf985c04524e..bce30e72dfde 100644
--- a/trunk/drivers/net/ethernet/broadcom/bgmac.c
+++ b/trunk/drivers/net/ethernet/broadcom/bgmac.c
@@ -301,12 +301,16 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
 			bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
 				  ring->start);
 		} else {
+			/* Omit CRC. */
+			len -= ETH_FCS_LEN;
+
 			new_skb = netdev_alloc_skb_ip_align(bgmac->net_dev, len);
 			if (new_skb) {
 				skb_put(new_skb, len);
 				skb_copy_from_linear_data_offset(skb, BGMAC_RX_FRAME_OFFSET,
 								 new_skb->data,
 								 len);
+				skb_checksum_none_assert(skb);
 				new_skb->protocol =
 					eth_type_trans(new_skb, bgmac->net_dev);
 				netif_receive_skb(new_skb);