patch 'net/e1000: fix variable shadowing' has been queued to stable release 24.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.5

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/22/26. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/a95121e5c30b2329deda4ce351e957e4d23216de

Thanks.

Luca Boccassi

---
>From a95121e5c30b2329deda4ce351e957e4d23216de Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 14 Jan 2026 15:44:27 +0000
Subject: [PATCH] net/e1000: fix variable shadowing

[ upstream commit 5c01159bf31e295c7d59f2e61d0b3afd7a9f6c14 ]

Variable "ret" was shadowed within the close function, so rename outer
variable to "retval" to clear the warnings.

Fixes: 62024eb82756 ("ethdev: change stop operation callback to return int")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/igc/igc_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index 6bd0885a03..34c5951cfa 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -1309,14 +1309,14 @@ eth_igc_close(struct rte_eth_dev *dev)
 	struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
 	struct igc_adapter *adapter = IGC_DEV_PRIVATE(dev);
 	int retry = 0;
-	int ret = 0;
+	int retval = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
 		return 0;
 
 	if (!adapter->stopped)
-		ret = eth_igc_stop(dev);
+		retval = eth_igc_stop(dev);
 
 	igc_flow_flush(dev, NULL);
 	igc_clear_all_filter(dev);
@@ -1339,7 +1339,7 @@ eth_igc_close(struct rte_eth_dev *dev)
 	/* Reset any pending lock */
 	igc_reset_swfw_lock(hw);
 
-	return ret;
+	return retval;
 }
 
 static void
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-20 14:55:43.972334318 +0000
+++ 0016-net-e1000-fix-variable-shadowing.patch	2026-02-20 14:55:43.176190600 +0000
@@ -1 +1 @@
-From 5c01159bf31e295c7d59f2e61d0b3afd7a9f6c14 Mon Sep 17 00:00:00 2001
+From a95121e5c30b2329deda4ce351e957e4d23216de Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c01159bf31e295c7d59f2e61d0b3afd7a9f6c14 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15 +16 @@
- drivers/net/intel/e1000/igc_ethdev.c | 6 +++---
+ drivers/net/igc/igc_ethdev.c | 6 +++---
@@ -18,6 +19,6 @@
-diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c
-index b9c91d2446..47a91fe38e 100644
---- a/drivers/net/intel/e1000/igc_ethdev.c
-+++ b/drivers/net/intel/e1000/igc_ethdev.c
-@@ -1313,14 +1313,14 @@ eth_igc_close(struct rte_eth_dev *dev)
- 	struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
+index 6bd0885a03..34c5951cfa 100644
+--- a/drivers/net/igc/igc_ethdev.c
++++ b/drivers/net/igc/igc_ethdev.c
+@@ -1309,14 +1309,14 @@ eth_igc_close(struct rte_eth_dev *dev)
+ 	struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
@@ -39 +40 @@
-@@ -1343,7 +1343,7 @@ eth_igc_close(struct rte_eth_dev *dev)
+@@ -1339,7 +1339,7 @@ eth_igc_close(struct rte_eth_dev *dev)