patch 'ethdev: fix variable shadowing' has been queued to stable release 23.11.7

[Shani Peretz]

Hi,

FYI, your patch has been queued to stable release 23.11.7

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

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

Thanks.

Shani

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

[ upstream commit a92bd5bf2a53c3bf0945be693fb6d80a7863f9a6 ]

Remove unneeded extra variable definitions, and rename variables as
necessary to ensure clean compile with -Wshadow warnings enabled.

Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs")
Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/ethdev/ethdev_driver.c | 6 +++---
 lib/ethdev/rte_ethdev.c    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index 47659d5e8c..d33c00dd66 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -281,7 +281,7 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
 int
 rte_eth_dev_create(struct rte_device *device, const char *name,
 	size_t priv_data_size,
-	ethdev_bus_specific_init ethdev_bus_specific_init,
+	ethdev_bus_specific_init bus_specific_init,
 	void *bus_init_params,
 	ethdev_init_t ethdev_init, void *init_params)
 {
@@ -329,8 +329,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 
 	ethdev->device = device;
 
-	if (ethdev_bus_specific_init) {
-		retval = ethdev_bus_specific_init(ethdev, bus_init_params);
+	if (bus_specific_init) {
+		retval = bus_specific_init(ethdev, bus_init_params);
 		if (retval) {
 			RTE_ETHDEV_LOG(ERR,
 				"ethdev bus specific initialisation failed\n");
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 704fc3eae2..3f4786f5f2 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -2332,7 +2332,6 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 	if (local_conf.offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO) {
 		uint32_t overhead_len;
 		uint32_t max_rx_pktlen;
-		int ret;
 
 		overhead_len = eth_dev_get_overhead_len(dev_info.max_rx_pktlen,
 				dev_info.max_mtu);
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-03-31 00:32:30.922315194 +0300
+++ 0015-ethdev-fix-variable-shadowing.patch	2026-03-31 00:32:28.494375000 +0300
@@ -1 +1 @@
-From a92bd5bf2a53c3bf0945be693fb6d80a7863f9a6 Mon Sep 17 00:00:00 2001
+From f4b234343c808777df479b1e9940e27bfcf207cc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a92bd5bf2a53c3bf0945be693fb6d80a7863f9a6 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index f89562b237..2ec665be0f 100644
+index 47659d5e8c..d33c00dd66 100644
@@ -26 +27 @@
-@@ -310,7 +310,7 @@ RTE_EXPORT_INTERNAL_SYMBOL(rte_eth_dev_create)
+@@ -281,7 +281,7 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
@@ -35 +36 @@
-@@ -358,8 +358,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -329,8 +329,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
@@ -44,2 +45,2 @@
- 			RTE_ETHDEV_LOG_LINE(ERR,
- 				"ethdev bus specific initialisation failed");
+ 			RTE_ETHDEV_LOG(ERR,
+ 				"ethdev bus specific initialisation failed\n");
@@ -47 +48 @@
-index c6fe0d5165..2659e8d9eb 100644
+index 704fc3eae2..3f4786f5f2 100644
@@ -50 +51 @@
-@@ -2471,7 +2471,6 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
+@@ -2332,7 +2332,6 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,