commit 554ff96f6e52fdd309e1a1a5f7dcc45487813947
author Aaron Germuth <germuth@google.com> Thu Dec 22 19:00:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 22 19:00:47 2016 +0000
tree d8b6fafa9dcb951da320a4ff22be946e584cc766
parent 0d63790e9b116e0512dbc6d04c752868ee84089d
parent cc2c201067c613070ad79f4754c24ce9a490f48a

Merge "Marvell: MHSLPONLGCY-161 Wrong packet size when forwarding from mv_cph from WAN to LAN and vice-versa"

arch/arm/plat-feroceon/mv_drivers_lsp/mv_cph/mv_cph_app.c

diff --git a/arch/arm/plat-feroceon/mv_drivers_lsp/mv_cph/mv_cph_app.c b/arch/arm/plat-feroceon/mv_drivers_lsp/mv_cph/mv_cph_app.c
index 48a59e7..da61465 100755
--- a/arch/arm/plat-feroceon/mv_drivers_lsp/mv_cph/mv_cph_app.c
+++ b/arch/arm/plat-feroceon/mv_drivers_lsp/mv_cph/mv_cph_app.c
@@ -1322,6 +1322,10 @@
                 skb_new = skb_old;
                 goto out;
             }
+            // Remove CRC from original message. It is not needed when forwarding to WAN interface
+            skb_old->tail -= MV_ETH_CRC_SIZE;  // Remove CRC
+            skb_old->len  -= MV_ETH_CRC_SIZE;  // Remove CRC
+
             /* If WAN interface is GMAC1, remove MH in upstream  */
             cph_db_get_param(CPH_DB_PARAM_PROFILE_ID, &profile_id);
             cph_db_get_param(CPH_DB_PARAM_ACTIVE_PORT, &active_port);