patch 'net: fix variable shadowing' has been queued to stable release 24.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 20 15:55:11 CET 2026
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/7e3843c6e69737c1562bc1f00bb16f261bc3227d
Thanks.
Luca Boccassi
---
>From 7e3843c6e69737c1562bc1f00bb16f261bc3227d Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 14 Jan 2026 15:44:19 +0000
Subject: [PATCH] net: fix variable shadowing
[ upstream commit a2472f3a81d04c1cd5e08a0eb5dff87fba736935 ]
The "mask" local variable shadowed a global definition. The local var
was only used on two lines as a temporary value to pass the return value
of one function as a parameter to another. Therefore, we can remove the
shadowing issue by removing the variable.
Fixes: 17a937baed3e ("net: add CRC AVX512 implementation")
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
lib/net/net_crc_avx512.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
index d18eb96971..7cd681b1cd 100644
--- a/lib/net/net_crc_avx512.c
+++ b/lib/net/net_crc_avx512.c
@@ -180,7 +180,6 @@ crc32_eth_calc_vpclmulqdq(const uint8_t *data, uint32_t data_len, uint32_t crc,
__m512i temp, k;
__m512i qw0 = _mm512_set1_epi64(0), qw1, qw2, qw3;
__m512i fold0, fold1, fold2, fold3;
- __mmask16 mask;
uint32_t n = 0;
int reduction = 0;
@@ -260,8 +259,7 @@ crc32_eth_calc_vpclmulqdq(const uint8_t *data, uint32_t data_len, uint32_t crc,
res = _mm_xor_si128(res, d);
} else {
res = _mm_cvtsi32_si128(crc);
- mask = byte_len_to_mask_table[data_len];
- d = _mm_maskz_loadu_epi8(mask, data);
+ d = _mm_maskz_loadu_epi8(byte_len_to_mask_table[data_len], data);
res = _mm_xor_si128(res, d);
if (data_len > 3) {
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-02-20 14:55:43.721433798 +0000
+++ 0009-net-fix-variable-shadowing.patch 2026-02-20 14:55:43.160190328 +0000
@@ -1 +1 @@
-From a2472f3a81d04c1cd5e08a0eb5dff87fba736935 Mon Sep 17 00:00:00 2001
+From 7e3843c6e69737c1562bc1f00bb16f261bc3227d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2472f3a81d04c1cd5e08a0eb5dff87fba736935 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list