]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
lan743x: trim all 4 bytes of the FCS; not just 2
authorGeorge McCollister <george.mccollister@gmail.com>
Fri, 5 Mar 2021 22:24:45 +0000 (16:24 -0600)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Mar 2021 22:42:55 +0000 (14:42 -0800)
Trim all 4 bytes of the received FCS; not just 2 of them. Leaving 2
bytes of the FCS on the frame breaks DSA tailing tag drivers.

Fixes: a8db76d40e4d ("lan743x: boost performance on cpu archs w/o dma cache snooping")
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/microchip/lan743x_main.c

index dbdfabff3b0034e64db879b117e5749c6dd6281e..1c3e204d727cf8b242e6befc3a8f79791b96306f 100644 (file)
@@ -2040,7 +2040,7 @@ lan743x_rx_trim_skb(struct sk_buff *skb, int frame_length)
                dev_kfree_skb_irq(skb);
                return NULL;
        }
-       frame_length = max_t(int, 0, frame_length - RX_HEAD_PADDING - 2);
+       frame_length = max_t(int, 0, frame_length - RX_HEAD_PADDING - 4);
        if (skb->len > frame_length) {
                skb->tail -= skb->len - frame_length;
                skb->len = frame_length;