Drop net-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.0/net-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch b/queue-6.0/net-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch
deleted file mode 100644 (file)
index 2880f5c..0000000
--- a/queue-6.0/net-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e47ec25c93bd242a89398498f2f29ab1a8cd8533 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Oct 2022 14:51:47 +0100
-Subject: net/mlx5e: TC, Fix cloned flow attr instance dests are not zeroed
-
-From: Roi Dayan <roid@nvidia.com>
-
-[ Upstream commit 94d651739e17b0ee9b556e60f206fe538d06dc05 ]
-
-On multi table split the driver creates a new attr instance with
-data being copied from prev attr instance zeroing action flags.
-Also need to reset dests properties to avoid incorrect dests per attr.
-
-Fixes: 8300f225268b ("net/mlx5e: Create new flow attr for multi table actions")
-Signed-off-by: Roi Dayan <roid@nvidia.com>
-Reviewed-by: Maor Dickman <maord@nvidia.com>
-Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
-Link: https://lore.kernel.org/r/20221026135153.154807-10-saeed@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
-index a687f047e3ae..8998450c61a3 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
-@@ -3619,6 +3619,10 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,
-       attr2->action = 0;
-       attr2->flags = 0;
-       attr2->parse_attr = parse_attr;
-+      attr2->esw_attr->out_count = 0;
-+      attr2->esw_attr->split_count = 0;
-+      attr2->dest_chain = 0;
-+      attr2->dest_ft = NULL;
-       return attr2;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 7045b2085c911fe0574b4565750833231ed3084a..f6ad582df3a738efaaaa2289460315b30155a9d1 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -228,7 +228,6 @@ net-mlx5e-update-restore-chain-id-for-slow-path-pack.patch
 net-mlx5-aso-create-the-aso-sq-with-the-correct-time.patch
 net-mlx5-fix-possible-use-after-free-in-async-comman.patch
 net-mlx5e-tc-reject-forwarding-from-internal-port-to.patch
-net-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch
 net-mlx5-update-fw-fatal-reporter-state-on-pci-handl.patch
 net-mlx5-fix-crash-during-sync-firmware-reset.patch
 net-do-not-sense-pfmemalloc-status-in-skb_append_pag.patch