patch 'power: fix variable shadowing' has been queued to stable release 25.11.1
Kevin Traynor
ktraynor at redhat.com
Thu Feb 26 14:08:15 CET 2026
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/ab0c9767f0d565825aeaac45c8600d3229bfa678
Thanks.
Kevin
---
>From ab0c9767f0d565825aeaac45c8600d3229bfa678 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 14 Jan 2026 15:44:22 +0000
Subject: [PATCH] power: fix variable shadowing
[ upstream commit 1893a6331a46603803a23d07a5a6a9fa564cbc3d ]
The "pause_duration" variable is a global and then shadowed as a local
var in clb_pause. Rename the local variable to allow building with
"-Wshadow".
Fixes: 4a8fbc28e431 ("power: add get/set pause duration API")
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
lib/power/rte_power_pmd_mgmt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index 6cacc562c2..a4d53aac2a 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -338,5 +338,5 @@ clb_pause(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused,
struct pmd_core_cfg *lcore_conf;
const bool empty = nb_rx == 0;
- uint32_t pause_duration = rte_power_pmd_mgmt_get_pause_duration();
+ const uint32_t duration = rte_power_pmd_mgmt_get_pause_duration();
lcore_conf = RTE_LCORE_VAR(lcore_cfgs);
@@ -358,9 +358,9 @@ clb_pause(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused,
const uint64_t cur = rte_rdtsc();
const uint64_t wait_tsc =
- cur + global_data.tsc_per_us * pause_duration;
+ cur + global_data.tsc_per_us * duration;
rte_power_pause(wait_tsc);
} else {
uint64_t i;
- for (i = 0; i < global_data.pause_per_us * pause_duration; i++)
+ for (i = 0; i < global_data.pause_per_us * duration; i++)
rte_pause();
}
--
2.53.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-02-26 10:16:47.685290258 +0000
+++ 0013-power-fix-variable-shadowing.patch 2026-02-26 10:16:46.899459010 +0000
@@ -1 +1 @@
-From 1893a6331a46603803a23d07a5a6a9fa564cbc3d Mon Sep 17 00:00:00 2001
+From ab0c9767f0d565825aeaac45c8600d3229bfa678 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1893a6331a46603803a23d07a5a6a9fa564cbc3d ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list