Linux 5.10.217

[thirdparty/kernel/stable-queue.git] / queue-5.10 / net-qede-use-return-from-qede_parse_flow_attr-for-fl.patch

diff --git a/queue-5.10/net-qede-use-return-from-qede_parse_flow_attr-for-fl.patch b/queue-5.10/net-qede-use-return-from-qede_parse_flow_attr-for-fl.patch
deleted file mode 100644 (file)
index 078cd84..0000000
--- a/queue-5.10/net-qede-use-return-from-qede_parse_flow_attr-for-fl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1cfe0b1b0c0c329838a808f514f0e539918a4038 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 26 Apr 2024 09:12:24 +0000
-Subject: net: qede: use return from qede_parse_flow_attr() for flower
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Asbjørn Sloth Tønnesen <ast@fiberby.net>
-
-[ Upstream commit fcee2065a178f78be6fd516302830378b17dba3d ]
-
-In qede_add_tc_flower_fltr(), when calling
-qede_parse_flow_attr() then the return code
-was only used for a non-zero check, and then
--EINVAL was returned.
-
-qede_parse_flow_attr() can currently fail with:
-* -EINVAL
-* -EOPNOTSUPP
-* -EPROTONOSUPPORT
-
-This patch changes the code to use the actual
-return code, not just return -EINVAL.
-
-The blaimed commit introduced these functions.
-
-Only compile tested.
-
-Fixes: 2ce9c93eaca6 ("qede: Ingress tc flower offload (drop action) support.")
-Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/qlogic/qede/qede_filter.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
-index ba28381c26bbf..413e8331a0ce6 100644
---- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
-+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
-@@ -1888,10 +1888,9 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
-       }
- 
-       /* parse flower attribute and prepare filter */
--      if (qede_parse_flow_attr(edev, proto, f->rule, &t)) {
--              rc = -EINVAL;
-+      rc = qede_parse_flow_attr(edev, proto, f->rule, &t);
-+      if (rc)
-               goto unlock;
--      }
- 
-       /* Validate profile mode and number of filters */
-       if ((edev->arfs->filter_count && edev->arfs->mode != t.mode) ||
--- 
-2.43.0
-