forked from Openwrt/openwrt
e8b00cfdcb
Move and rename patches which were merged upstream and import follow-up
fixes for MediaTek Ethernet offloading features on MT7622 and Filogic
platforms. Remove patch
793-net-ethernet-mtk_eth_soc-fix-typo-in-__mtk_foe_entry.patch
which breaks hardware flow offloading on MT7622, it will be reverted
upstream as well.
Fixes: c93c5365c0 ("kernel: pick patches for MediaTek Ethernet from linux-next")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 40350ce3ae8701146aafd79c5f7b5582d9955e58 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Sun, 25 Sep 2022 15:12:35 +0100
|
|
Subject: [PATCH 1/2] net: ethernet: mtk_eth_soc: fix wrong use of new helper
|
|
function
|
|
To: linux-mediatek@lists.infradead.org,
|
|
netdev@vger.kernel.org,
|
|
Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Cc: Sujuan Chen <sujuan.chen@mediatek.com>,
|
|
Bo Jiao <Bo.Jiao@mediatek.com>,
|
|
Felix Fietkau <nbd@nbd.name>,
|
|
John Crispin <john@phrozen.org>,
|
|
Sean Wang <sean.wang@mediatek.com>,
|
|
Mark Lee <Mark-MC.Lee@mediatek.com>,
|
|
David S. Miller <davem@davemloft.net>,
|
|
Eric Dumazet <edumazet@google.com>,
|
|
Jakub Kicinski <kuba@kernel.org>,
|
|
Paolo Abeni <pabeni@redhat.com>,
|
|
Matthias Brugger <matthias.bgg@gmail.com>,
|
|
Chen Minqiang <ptpt52@gmail.com>
|
|
|
|
In function mtk_foe_entry_set_vlan() the call to field accessor macro
|
|
FIELD_GET(MTK_FOE_IB1_BIND_VLAN_LAYER, entry->ib1)
|
|
has been wrongly replaced by
|
|
mtk_prep_ib1_vlan_layer(eth, entry->ib1)
|
|
|
|
Use correct helper function mtk_get_ib1_vlan_layer instead.
|
|
|
|
Reported-by: Chen Minqiang <ptpt52@gmail.com>
|
|
Fixes: 03a3180e5c09e1 ("net: ethernet: mtk_eth_soc: introduce flow offloading support for mt7986")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
@@ -337,7 +337,7 @@ int mtk_foe_entry_set_vlan(struct mtk_et
|
|
{
|
|
struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(eth, entry);
|
|
|
|
- switch (mtk_prep_ib1_vlan_layer(eth, entry->ib1)) {
|
|
+ switch (mtk_get_ib1_vlan_layer(eth, entry->ib1)) {
|
|
case 0:
|
|
entry->ib1 |= mtk_get_ib1_vlan_tag_mask(eth) |
|
|
mtk_prep_ib1_vlan_layer(eth, 1);
|