brcm47xx: bgmac: omit the fcs

This fixes #13058 and hopefully #12927

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35834 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 (file)
index 0000000..9d8733f
--- /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 (file)
index 0000000..9d8733f
--- /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);