From: Felix Fietkau Date: Thu, 7 Apr 2022 11:07:30 +0000 (+0200) Subject: kernel: remove duplicate patch that is already in the 5.15 kernel tree X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5916a53b864d11ee0ba95070481c007a5ef1d0a;p=openwrt%2Fstaging%2Fblocktrron.git kernel: remove duplicate patch that is already in the 5.15 kernel tree Signed-off-by: Felix Fietkau --- diff --git a/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch b/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch deleted file mode 100644 index 6323e5e966..0000000000 --- a/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Felix Fietkau -Date: Thu, 8 Jul 2021 07:08:29 +0200 -Subject: [PATCH] net: ethernet: mtk_eth_soc: avoid creating duplicate offload - entries - -Sometimes multiple CLS_REPLACE calls are issued for the same connection. -rhashtable_insert_fast does not check for these duplicates, so multiple -hardware flow entries can be created. -Fix this by checking for an existing entry early - -Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support") -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -@@ -189,6 +189,9 @@ mtk_flow_offload_replace(struct mtk_eth - if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) - return -EEXIST; - -+ if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) -+ return -EEXIST; -+ - if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) { - struct flow_match_meta match; -