patch 'net/bnx2x: remove dead conditional' has been queued to stable release 21.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/24. 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/e8c123ffdb05d5da33461db7959c6070e3ca3a89

Thanks.

Kevin

---
>From e8c123ffdb05d5da33461db7959c6070e3ca3a89 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 12 Nov 2024 09:43:53 -0800
Subject: [PATCH] net/bnx2x: remove dead conditional

[ upstream commit 3868c0ce5ce83eacc9611cc4a83d20120ae3442e ]

The second if test here is impossible because it contradicts
previous line.

Coverity issue: 384428
Fixes: 540a211084a7 ("bnx2x: driver core")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/bnx2x/bnx2x_stats.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c
index 69132c7c80..72a26ed5cc 100644
--- a/drivers/net/bnx2x/bnx2x_stats.c
+++ b/drivers/net/bnx2x/bnx2x_stats.c
@@ -76,8 +76,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc)
 
 	if (!sc->stats_pending) {
-		if (sc->stats_pending) {
-			return;
-		}
-
 		sc->fw_stats_req->hdr.drv_stats_counter =
 			htole16(sc->stats_counter++);
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:41.433440660 +0000
+++ 0101-net-bnx2x-remove-dead-conditional.patch	2024-11-27 17:17:38.313269829 +0000
@@ -1 +1 @@
-From 3868c0ce5ce83eacc9611cc4a83d20120ae3442e Mon Sep 17 00:00:00 2001
+From e8c123ffdb05d5da33461db7959c6070e3ca3a89 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3868c0ce5ce83eacc9611cc4a83d20120ae3442e ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- drivers/net/bnx2x/bnx2x_stats.c | 3 ---
- 1 file changed, 3 deletions(-)
+ drivers/net/bnx2x/bnx2x_stats.c | 4 ----
+ 1 file changed, 4 deletions(-)
@@ -19 +20 @@
-index d473c5e7ec..8adbe7e381 100644
+index 69132c7c80..72a26ed5cc 100644
@@ -22 +23 @@
-@@ -74,7 +74,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc)
+@@ -76,8 +76,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc)
@@ -25 +26 @@
--		if (sc->stats_pending)
+-		if (sc->stats_pending) {
@@ -26,0 +28 @@
+-		}