a878dd24e7
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.93 Removed upstreamed: backport-6.6/780-51-v6.15-r8169-don-t-scan-PHY-addresses-0.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.93&id=961ee132104b09e054308e53d8ab4a2386a21904 Build system: x86/64 Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19026 Signed-off-by: Nick Hainke <vincent@systemli.org>
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 73cfd947dbdb25ef9863ac49c4596a7d53ad4025 Mon Sep 17 00:00:00 2001
|
|
From: Elad Yifee <eladwf@gmail.com>
|
|
Date: Sun, 23 Jun 2024 20:51:09 +0300
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: ppe: prevent ppe update for
|
|
non-mtk devices
|
|
|
|
Introduce an additional validation to ensure that the PPE index
|
|
is modified exclusively for mtk_eth ingress devices.
|
|
This primarily addresses the issue related
|
|
to WED operation with multiple PPEs.
|
|
|
|
Fixes: dee4dd10c79a ("net: ethernet: mtk_eth_soc: ppe: add support for multiple PPEs")
|
|
Signed-off-by: Elad Yifee <eladwf@gmail.com>
|
|
Link: https://lore.kernel.org/r/20240623175113.24437-1-eladwf@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
@@ -268,7 +268,7 @@ mtk_flow_offload_replace(struct mtk_eth
|
|
flow_rule_match_meta(rule, &match);
|
|
if (mtk_is_netsys_v2_or_greater(eth)) {
|
|
idev = __dev_get_by_index(&init_net, match.key->ingress_ifindex);
|
|
- if (idev) {
|
|
+ if (idev && idev->netdev_ops == eth->netdev[0]->netdev_ops) {
|
|
struct mtk_mac *mac = netdev_priv(idev);
|
|
|
|
if (WARN_ON(mac->ppe_idx >= eth->soc->ppe_num))
|