patch 'net/intel: fix comma operator warnings' has been queued to stable release 25.11.1
Kevin Traynor
ktraynor at redhat.com
Thu Feb 26 14:10:17 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/a1f00deb59335f5f6ddf29f9f7cc3ccd43dac4a3
Thanks.
Kevin
---
>From a1f00deb59335f5f6ddf29f9f7cc3ccd43dac4a3 Mon Sep 17 00:00:00 2001
From: Venkatesh Vemula <venkatesh.vemula at intel.com>
Date: Tue, 20 Jan 2026 06:41:56 +0000
Subject: [PATCH] net/intel: fix comma operator warnings
[ upstream commit 3dd316f03ec631cb3d1cc79347a69222840e7151 ]
Fix comma operator misuse warnings with clang compiler for intel PMDs
when -Wcomma enabled.
Bugzilla ID: 1809
Fixes: b3fa893d84d6 ("i40e: fix using memory after free")
Fixes: aed68d5b0e81 ("net/i40e: add AVX2 Tx function")
Fixes: e6a6a138919f ("net/i40e: add AVX512 vector path")
Fixes: af0c246a3800 ("net/iavf: enable AVX2 for iavf")
Fixes: 9ab9514c150e ("net/iavf: enable AVX512 for Tx")
Fixes: f9cf4f864150 ("net/ice: support device initialization")
Fixes: 2d5f6953d56d ("net/ice: support vector AVX2 in Tx")
Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path")
Fixes: afac6261461f ("common/idpf: enable AVX2 for single queue Tx")
Fixes: 5bf87b45b2c8 ("net/idpf: add AVX512 data path for single queue model")
Fixes: e528d7c74819 ("common/idpf: add AVX512 data path for split queue model")
Signed-off-by: Venkatesh Vemula <venkatesh.vemula at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
drivers/net/intel/i40e/i40e_ethdev.c | 10 ++++------
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c | 4 ++--
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c | 2 +-
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c | 4 ++--
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 6 +++---
drivers/net/intel/ice/ice_ethdev.c | 10 ++++------
drivers/net/intel/ice/ice_rxtx_vec_avx2.c | 4 ++--
drivers/net/intel/ice/ice_rxtx_vec_avx512.c | 2 +-
drivers/net/intel/idpf/idpf_common_rxtx_avx2.c | 4 ++--
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c | 8 ++++----
10 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c
index c8153f3351..b891215191 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.c
+++ b/drivers/net/intel/i40e/i40e_ethdev.c
@@ -5109,14 +5109,12 @@ i40e_res_pool_destroy(struct i40e_res_pool_info *pool)
return;
- for (entry = LIST_FIRST(&pool->alloc_list);
- entry && (next_entry = LIST_NEXT(entry, next), 1);
- entry = next_entry) {
+ for (entry = LIST_FIRST(&pool->alloc_list); entry; entry = next_entry) {
+ next_entry = LIST_NEXT(entry, next);
LIST_REMOVE(entry, next);
rte_free(entry);
}
- for (entry = LIST_FIRST(&pool->free_list);
- entry && (next_entry = LIST_NEXT(entry, next), 1);
- entry = next_entry) {
+ for (entry = LIST_FIRST(&pool->free_list); entry; entry = next_entry) {
+ next_entry = LIST_NEXT(entry, next);
LIST_REMOVE(entry, next);
rte_free(entry);
diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
index aeb2756e7a..07b68ff3db 100644
--- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
@@ -704,5 +704,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -731,5 +731,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
while (nb_pkts) {
vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
index 571987d27a..8d1d3bd78e 100644
--- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
@@ -799,5 +799,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
while (nb_pkts) {
vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
index e417257086..ca4494d548 100644
--- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
@@ -1656,5 +1656,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -1705,5 +1705,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
while (nb_pkts) {
iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
index 7c0907b7cf..3aced29784 100644
--- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
@@ -1870,5 +1870,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -1914,5 +1914,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
while (nb_pkts) {
iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
@@ -2117,5 +2117,5 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
ctx_vtx1(txdp, *pkt, flags, offload, vlan_flag);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c
index 3242572cd8..ad23898fc5 100644
--- a/drivers/net/intel/ice/ice_ethdev.c
+++ b/drivers/net/intel/ice/ice_ethdev.c
@@ -946,14 +946,12 @@ ice_res_pool_destroy(struct ice_res_pool_info *pool)
return;
- for (entry = LIST_FIRST(&pool->alloc_list);
- entry && (next_entry = LIST_NEXT(entry, next), 1);
- entry = next_entry) {
+ for (entry = LIST_FIRST(&pool->alloc_list); entry; entry = next_entry) {
+ next_entry = LIST_NEXT(entry, next);
LIST_REMOVE(entry, next);
rte_free(entry);
}
- for (entry = LIST_FIRST(&pool->free_list);
- entry && (next_entry = LIST_NEXT(entry, next), 1);
- entry = next_entry) {
+ for (entry = LIST_FIRST(&pool->free_list); entry; entry = next_entry) {
+ next_entry = LIST_NEXT(entry, next);
LIST_REMOVE(entry, next);
rte_free(entry);
diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
index b952b8dddc..b9a55d670f 100644
--- a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
@@ -799,5 +799,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
ice_vtx1(txdp, *pkt, flags, offload);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -844,5 +844,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
while (nb_pkts) {
ice_vtx1(txdp, *pkt, flags, offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
index 7c6fe82072..585d56122f 100644
--- a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
@@ -908,5 +908,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkt,
while (nb_pkts) {
ice_vtx1(txdp, *pkt, flags, do_offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
index 21c8f79254..c86753fb43 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
@@ -507,5 +507,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -548,5 +548,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
while (nb_pkts) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
index bc2cadd738..1d0516c755 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
@@ -1026,5 +1026,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -1064,5 +1064,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
while (nb_pkts) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
@@ -1227,5 +1227,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
idpf_splitq_vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
@@ -1265,5 +1265,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
while (nb_pkts) {
idpf_splitq_vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
--
2.53.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-02-26 10:16:52.321149102 +0000
+++ 0135-net-intel-fix-comma-operator-warnings.patch 2026-02-26 10:16:47.206460352 +0000
@@ -1 +1 @@
-From 3dd316f03ec631cb3d1cc79347a69222840e7151 Mon Sep 17 00:00:00 2001
+From a1f00deb59335f5f6ddf29f9f7cc3ccd43dac4a3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3dd316f03ec631cb3d1cc79347a69222840e7151 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -62 +63 @@
-index e1672c4371..88de303349 100644
+index aeb2756e7a..07b68ff3db 100644
@@ -65 +66 @@
-@@ -703,5 +703,5 @@ vtx(volatile struct ci_tx_desc *txdp,
+@@ -704,5 +704,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -72 +73 @@
-@@ -730,5 +730,5 @@ vtx(volatile struct ci_tx_desc *txdp,
+@@ -731,5 +731,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -80 +81 @@
-index bceb95ad2d..0c2e699a95 100644
+index 571987d27a..8d1d3bd78e 100644
@@ -83 +84 @@
-@@ -790,5 +790,5 @@ vtx(volatile struct ci_tx_desc *txdp,
+@@ -799,5 +799,5 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -91 +92 @@
-index 374c713a94..2e18be3616 100644
+index e417257086..ca4494d548 100644
@@ -94 +95 @@
-@@ -1654,5 +1654,5 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1656,5 +1656,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -101 +102 @@
-@@ -1695,5 +1695,5 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1705,5 +1705,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -109 +110 @@
-index 01477fd501..9a93a0b062 100644
+index 7c0907b7cf..3aced29784 100644
@@ -112 +113 @@
-@@ -1868,5 +1868,5 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1870,5 +1870,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -119 +120 @@
-@@ -1904,5 +1904,5 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1914,5 +1914,5 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -126 +127 @@
-@@ -2106,5 +2106,5 @@ ctx_vtx(volatile struct ci_tx_desc *txdp,
+@@ -2117,5 +2117,5 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
@@ -134 +135 @@
-index ade13600de..41474b7002 100644
+index 3242572cd8..ad23898fc5 100644
@@ -157 +158 @@
-index d03f2e5b36..b72f69a47b 100644
+index b952b8dddc..b9a55d670f 100644
@@ -160 +161 @@
-@@ -797,5 +797,5 @@ ice_vtx(volatile struct ci_tx_desc *txdp,
+@@ -799,5 +799,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
@@ -167 +168 @@
-@@ -834,5 +834,5 @@ ice_vtx(volatile struct ci_tx_desc *txdp,
+@@ -844,5 +844,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
@@ -175 +176 @@
-index 004c01054a..309ab9fca7 100644
+index 7c6fe82072..585d56122f 100644
@@ -178 +179 @@
-@@ -898,5 +898,5 @@ ice_vtx(volatile struct ci_tx_desc *txdp, struct rte_mbuf **pkt,
+@@ -908,5 +908,5 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkt,
@@ -186 +187 @@
-index 411b171b97..e228b72fa5 100644
+index 21c8f79254..c86753fb43 100644
@@ -189 +190 @@
-@@ -505,5 +505,5 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
+@@ -507,5 +507,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
@@ -196 +197 @@
-@@ -538,5 +538,5 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
+@@ -548,5 +548,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
@@ -204 +205 @@
-index c5f2018924..fe870617bc 100644
+index bc2cadd738..1d0516c755 100644
@@ -207 +208 @@
-@@ -1024,5 +1024,5 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1026,5 +1026,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
@@ -214 +215 @@
-@@ -1054,5 +1054,5 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1064,5 +1064,5 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
@@ -221 +222 @@
-@@ -1216,5 +1216,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
+@@ -1227,5 +1227,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
@@ -228 +229 @@
-@@ -1254,5 +1254,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
+@@ -1265,5 +1265,5 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
More information about the stable
mailing list