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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.1

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

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

Thanks.

Kevin

---
>From 3006f68e3e809cb32551a1eb87e48fefc58fa7a9 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/intel/e1000/igc_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
@@ -1314,5 +1314,5 @@ eth_igc_close(struct rte_eth_dev *dev)
 	struct igc_adapter *adapter = IGC_DEV_PRIVATE(dev);
 	int retry = 0;
-	int ret = 0;
+	int retval = 0;
 
 	PMD_INIT_FUNC_TRACE();
@@ -1321,5 +1321,5 @@ eth_igc_close(struct rte_eth_dev *dev)
 
 	if (!adapter->stopped)
-		ret = eth_igc_stop(dev);
+		retval = eth_igc_stop(dev);
 
 	igc_flow_flush(dev, NULL);
@@ -1344,5 +1344,5 @@ eth_igc_close(struct rte_eth_dev *dev)
 	igc_reset_swfw_lock(hw);
 
-	return ret;
+	return retval;
 }
 
-- 
2.53.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-26 10:16:47.824789649 +0000
+++ 0017-net-e1000-fix-variable-shadowing.patch	2026-02-26 10:16:46.905459037 +0000
@@ -1 +1 @@
-From 5c01159bf31e295c7d59f2e61d0b3afd7a9f6c14 Mon Sep 17 00:00:00 2001
+From 3006f68e3e809cb32551a1eb87e48fefc58fa7a9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c01159bf31e295c7d59f2e61d0b3afd7a9f6c14 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org