From: Ilya Lipnitskiy Date: Tue, 20 Apr 2021 01:25:27 +0000 (-0700) Subject: kernel: move patch to backport after upstreaming X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b96db94fb7775dc05c22d9a9262d75a42443aaeb;p=openwrt%2Fstaging%2Fblocktrron.git kernel: move patch to backport after upstreaming The patch is now in net-next so keep it in backport-5.10 to keep things more organized. Link: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6ecaf81d4ac6365f9284f9d68d74f7c209e74f98 Cc: Daniel Golle Signed-off-by: Ilya Lipnitskiy --- diff --git a/target/linux/generic/backport-5.10/610-v5.13-36-net-ethernet-mediatek-fix-a-typo-bug-in-flow-offload.patch b/target/linux/generic/backport-5.10/610-v5.13-36-net-ethernet-mediatek-fix-a-typo-bug-in-flow-offload.patch new file mode 100644 index 0000000000..de376bf78d --- /dev/null +++ b/target/linux/generic/backport-5.10/610-v5.13-36-net-ethernet-mediatek-fix-a-typo-bug-in-flow-offload.patch @@ -0,0 +1,29 @@ +From 6ecaf81d4ac6365f9284f9d68d74f7c209e74f98 Mon Sep 17 00:00:00 2001 +From: DENG Qingfang +Date: Sat, 17 Apr 2021 15:29:04 +0800 +Subject: [PATCH] net: ethernet: mediatek: fix a typo bug in flow offloading + +Issue was traffic problems after a while with increased ping times if +flow offload is active. It turns out that key_offset with cookie is +needed in rhashtable_params but was re-assigned to head_offset. +Fix the assignment. + +Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support") +Signed-off-by: DENG Qingfang +Tested-by: Frank Wunderlich +Signed-off-by: David S. Miller +--- + 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 +@@ -44,7 +44,7 @@ struct mtk_flow_entry { + + static const struct rhashtable_params mtk_flow_ht_params = { + .head_offset = offsetof(struct mtk_flow_entry, node), +- .head_offset = offsetof(struct mtk_flow_entry, cookie), ++ .key_offset = offsetof(struct mtk_flow_entry, cookie), + .key_len = sizeof(unsigned long), + .automatic_shrinking = true, + }; diff --git a/target/linux/generic/pending-5.10/615-net-ethernet-mediatek-fix-typo-in-offload-code.patch b/target/linux/generic/pending-5.10/615-net-ethernet-mediatek-fix-typo-in-offload-code.patch deleted file mode 100644 index 07a0867bba..0000000000 --- a/target/linux/generic/pending-5.10/615-net-ethernet-mediatek-fix-typo-in-offload-code.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec21551331bc071ed43c814265f014029fa5f95f Mon Sep 17 00:00:00 2001 -From: DENG Qingfang -Date: Thu, 15 Apr 2021 17:40:05 +0800 -Subject: [PATCH] net: ethernet: mediatek: fix typo in offload code - -.key_offset was assigned to .head_offset instead. Fix the typo. - -Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support") -Signed-off-by: DENG Qingfang ---- - 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 -@@ -44,7 +44,7 @@ struct mtk_flow_entry { - - static const struct rhashtable_params mtk_flow_ht_params = { - .head_offset = offsetof(struct mtk_flow_entry, node), -- .head_offset = offsetof(struct mtk_flow_entry, cookie), -+ .key_offset = offsetof(struct mtk_flow_entry, cookie), - .key_len = sizeof(unsigned long), - .automatic_shrinking = true, - };