mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 20 Mar 2023 15:37:55 +0100
|
|
Subject: [PATCH] net: ethernet: mediatek: mtk_ppe: prefer newly added l2
|
|
flows over existing ones
|
|
|
|
When a device is roaming between interfaces and a new flow entry is created,
|
|
we should assume that its output device is more up to date than whatever
|
|
entry existed already.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
@@ -639,10 +639,20 @@ void mtk_foe_entry_clear(struct mtk_ppe
|
|
static int
|
|
mtk_foe_entry_commit_l2(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
{
|
|
+ struct mtk_flow_entry *prev;
|
|
+
|
|
entry->type = MTK_FLOW_TYPE_L2;
|
|
|
|
- return rhashtable_insert_fast(&ppe->l2_flows, &entry->l2_node,
|
|
- mtk_flow_l2_ht_params);
|
|
+ prev = rhashtable_lookup_get_insert_fast(&ppe->l2_flows, &entry->l2_node,
|
|
+ mtk_flow_l2_ht_params);
|
|
+ if (likely(!prev))
|
|
+ return 0;
|
|
+
|
|
+ if (IS_ERR(prev))
|
|
+ return PTR_ERR(prev);
|
|
+
|
|
+ return rhashtable_replace_fast(&ppe->l2_flows, &prev->l2_node,
|
|
+ &entry->l2_node, mtk_flow_l2_ht_params);
|
|
}
|
|
|
|
int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|