kernel: backport upstream mtk_eth_soc fixes

[openwrt/staging/noltari.git] / target / linux / generic / pending-5.15 / 734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch

diff --git a/target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch b/target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch
index 94bb6a6a8f437eee46f01151fe86e6b8d1261ce8..3fdee298d94723e911a46467acdda898b80e44da 100644 (file)
--- a/target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch
+++ b/target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch
@@ -10,28 +10,6 @@ Fixes: 2d7605a72906 ("net: ethernet: mtk_eth_soc: enable hardware DSA untagging"
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1998,9 +1998,6 @@ static int mtk_poll_rx(struct napi_struc
-                       skb_checksum_none_assert(skb);
-               skb->protocol = eth_type_trans(skb, netdev);
- 
--              if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
--                      mtk_ppe_check_skb(eth->ppe[0], skb, hash);
--
-               /* When using VLAN untagging in combination with DSA, the
-                * hardware treats the MTK special tag as a VLAN and untags it.
-                */
-@@ -2013,6 +2010,9 @@ static int mtk_poll_rx(struct napi_struc
-                               skb_dst_set_noref(skb, &eth->dsa_meta[port]->dst);
-               }
- 
-+              if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
-+                      mtk_ppe_check_skb(eth->ppe[0], skb, hash);
-+
-               skb_record_rx_queue(skb, 0);
-               napi_gro_receive(napi, skb);
- 
 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
 @@ -8,6 +8,7 @@