4 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/stmmac/common.h b/drivers/net/stmmac/common.h
index 144f76fd3e39..66b9da0260fe 100644
--- a/drivers/net/stmmac/common.h
+++ b/drivers/net/stmmac/common.h
@@ -108,6 +108,7 @@ enum rx_frame_status { /* IPC status */
         good_frame = 0,
         discard_frame = 1,
         csum_none = 2,
+        llc_snap = 4,
 };
 
 enum tx_dma_irq_status {
diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/stmmac/dwmac1000.h
index d8d0f3553770..8b20b19971cb 100644
--- a/drivers/net/stmmac/dwmac1000.h
+++ b/drivers/net/stmmac/dwmac1000.h
@@ -93,7 +93,7 @@ enum inter_frame_gap {
 #define GMAC_CONTROL_IPC        0x00000400 /* Checksum Offload */
 #define GMAC_CONTROL_DR         0x00000200 /* Disable Retry */
 #define GMAC_CONTROL_LUD        0x00000100 /* Link up/down */
-#define GMAC_CONTROL_ACS        0x00000080 /* Automatic Pad Stripping */
+#define GMAC_CONTROL_ACS        0x00000080 /* Automatic Pad/FCS Stripping */
 #define GMAC_CONTROL_DC         0x00000010 /* Deferral Check */
 #define GMAC_CONTROL_TE         0x00000008 /* Transmitter Enable */
 #define GMAC_CONTROL_RE         0x00000004 /* Receiver Enable */
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/stmmac/enh_desc.c
index 3c18ebece043..f612f986a7e1 100644
--- a/drivers/net/stmmac/enh_desc.c
+++ b/drivers/net/stmmac/enh_desc.c
@@ -123,7 +123,7 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
          */
         if (status == 0x0) {
                 CHIP_DBG(KERN_INFO "RX Des0 status: IEEE 802.3 Type frame.\n");
-                ret = good_frame;
+                ret = llc_snap;
         } else if (status == 0x4) {
                 CHIP_DBG(KERN_INFO "RX Des0 status: IPv4/6 No CSUM errorS.\n");
                 ret = good_frame;
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",