1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 1083334ccd21..bbb7951b9c4c 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1216,9 +1216,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                         priv->dev->stats.rx_errors++;
                 else {
                         struct sk_buff *skb;
-                        /* Length should omit the CRC */
-                        int frame_len = priv->hw->desc->get_rx_frame_len(p) - 4;
+                        int frame_len;
 
+                        frame_len = priv->hw->desc->get_rx_frame_len(p);
+                        /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
+                         * Type frames (LLC/LLC-SNAP) */
+                        if (unlikely(status != llc_snap))
+                                frame_len -= ETH_FCS_LEN;
 #ifdef STMMAC_RX_DEBUG
                         if (frame_len > ETH_FRAME_LEN)
                                 pr_debug("\tRX frame size %d, COE status: %d\n",