From 04af8bd108cea6310477dcb8ab6aed3cd2389c3b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 28 Feb 2013 13:27:21 +0000 Subject: [PATCH] brcm47xx: bgmac: omit the fcs This fixes #13058 and hopefully #12927 SVN-Revision: 35834 --- .../patches-3.6/765-bgmac-omit-the-fcs.patch | 19 +++++++++++++++++++ .../patches-3.8/765-bgmac-omit-the-fcs.patch | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 target/linux/brcm47xx/patches-3.6/765-bgmac-omit-the-fcs.patch create mode 100644 target/linux/brcm47xx/patches-3.8/765-bgmac-omit-the-fcs.patch diff --git a/target/linux/brcm47xx/patches-3.6/765-bgmac-omit-the-fcs.patch b/target/linux/brcm47xx/patches-3.6/765-bgmac-omit-the-fcs.patch new file mode 100644 index 0000000000..9d8733fef2 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.6/765-bgmac-omit-the-fcs.patch @@ -0,0 +1,19 @@ +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -301,12 +301,16 @@ static int bgmac_dma_rx_read(struct bgma + 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); diff --git a/target/linux/brcm47xx/patches-3.8/765-bgmac-omit-the-fcs.patch b/target/linux/brcm47xx/patches-3.8/765-bgmac-omit-the-fcs.patch new file mode 100644 index 0000000000..9d8733fef2 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/765-bgmac-omit-the-fcs.patch @@ -0,0 +1,19 @@ +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -301,12 +301,16 @@ static int bgmac_dma_rx_read(struct bgma + 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); -- 2.30.2