aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-03-04 19:11:37 +0100
committerFelix Fietkau <nbd@nbd.name>2023-03-05 08:51:22 +0100
commitdaaf708b8c433cfedc7860eab30a9e585490b3c6 (patch)
treed885a4ee7dea6d35502ae0f4cc2fed1c251abe77 /target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch
parent5ef783c1b26bef0b6cdbf44401ff6fb487e4d2f5 (diff)
downloadupstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.tar.gz
upstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.tar.bz2
upstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.zip
kernel: backport upstream mtk_eth_soc fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch')
-rw-r--r--target/linux/generic/pending-5.15/734-net-ethernet-mtk_eth_soc-ppe-fix-L2-offloading-with-.patch22
1 files changed, 0 insertions, 22 deletions
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 94bb6a6a8f..3fdee298d9 100644
--- 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 @@