patch 'net/nfp: fix misuse of function return values' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/17/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/64c3aa631f76779366ce3a71c35985baac6806f4

Thanks.

Kevin

---
>From 64c3aa631f76779366ce3a71c35985baac6806f4 Mon Sep 17 00:00:00 2001
From: Zerun Fu <zerun.fu at corigine.com>
Date: Wed, 22 Jan 2025 09:33:20 +0800
Subject: [PATCH] net/nfp: fix misuse of function return values

[ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ]

The 'nfp_ct_offload_add()' return 0 means the result is right
while return negative number means the wrong result.

The caller assigns the 'int' variable to the 'bool' variable.
So the negative number will be transform to 'true'. This will
cause an error because 'true' will be regard as no problem.

Fixes: b4ae16eae01c ("net/nfp: support to add and delete flows to firmware")

Signed-off-by: Zerun Fu <zerun.fu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/net/nfp/flower/nfp_conntrack.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c
index 0b21e4ee5b..439a1a1b0e 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.c
+++ b/drivers/net/nfp/flower/nfp_conntrack.c
@@ -1441,4 +1441,5 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze,
 		struct nfp_ct_flow_entry *post_ct_entry)
 {
+	int err;
 	bool ret;
 	uint64_t new_cookie[2];
@@ -1509,7 +1510,8 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze,
 
 	/* Send to firmware */
-	ret = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry);
-	if (ret != 0) {
+	err = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry);
+	if (err != 0) {
 		PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed.");
+		ret = false;
 		goto merge_table_del;
 	}
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-12 17:29:38.985494059 +0000
+++ 0041-net-nfp-fix-misuse-of-function-return-values.patch	2025-02-12 17:29:34.320945751 +0000
@@ -1 +1 @@
-From f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 Mon Sep 17 00:00:00 2001
+From 64c3aa631f76779366ce3a71c35985baac6806f4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org