patch 'net/intel: fix comma operator warnings' has been queued to stable release 24.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 20 15:56:49 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/6c9bf6e3508122ae95b5f2cad677c38943492c91
Thanks.
Luca Boccassi
---
>From 6c9bf6e3508122ae95b5f2cad677c38943492c91 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/common/idpf/idpf_common_rxtx_avx512.c | 8 ++++----
drivers/net/i40e/i40e_ethdev.c | 10 ++++------
drivers/net/i40e/i40e_rxtx_vec_avx2.c | 4 ++--
drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
drivers/net/iavf/iavf_rxtx_vec_avx2.c | 4 ++--
drivers/net/iavf/iavf_rxtx_vec_avx512.c | 6 +++---
drivers/net/ice/ice_ethdev.c | 10 ++++------
drivers/net/ice/ice_rxtx_vec_avx2.c | 4 ++--
drivers/net/ice/ice_rxtx_vec_avx512.c | 2 +-
9 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index 9ea71c3718..b37702163a 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -1150,7 +1150,7 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do 4 at a time while possible, in bursts */
@@ -1188,7 +1188,7 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
idpf_singleq_vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
@@ -1452,7 +1452,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
idpf_splitq_vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do 4 at a time while possible, in bursts */
@@ -1490,7 +1490,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
/* do any last ones */
while (nb_pkts) {
idpf_splitq_vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 883c1a4f46..1405103d40 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5107,16 +5107,14 @@ i40e_res_pool_destroy(struct i40e_res_pool_info *pool)
if (pool == NULL)
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/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 3e95a6a1df..a75fc53e49 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -708,7 +708,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
vtx1(txdp, *pkt, flags);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do two at a time while possible, in bursts */
@@ -735,7 +735,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index ae7bcb582b..372409e801 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -915,7 +915,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
vtx1(txdp, *pkt, flags);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index cdb48438da..83db5ef3cc 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -1677,7 +1677,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
iavf_vtx1(txdp, *pkt, flags, offload);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do two at a time while possible, in bursts */
@@ -1726,7 +1726,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
iavf_vtx1(txdp, *pkt, flags, offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index d6a861bf80..5807755d8f 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -1999,7 +1999,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
iavf_vtx1(txdp, *pkt, flags, offload);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do 4 at a time while possible, in bursts */
@@ -2043,7 +2043,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
iavf_vtx1(txdp, *pkt, flags, offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
@@ -2239,7 +2239,7 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
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++;
}
for (; nb_pkts > 1; txdp += 4, pkt += 2, nb_pkts -= 2) {
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0796573f59..156a4fb78c 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -876,16 +876,14 @@ ice_res_pool_destroy(struct ice_res_pool_info *pool)
if (!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/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
index 02bfb9b15d..d62a0b907c 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -803,7 +803,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
/* if unaligned on 32-bit boundary, do one to align */
if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
ice_vtx1(txdp, *pkt, flags, offload);
- nb_pkts--, txdp++, pkt++;
+ nb_pkts--; txdp++; pkt++;
}
/* do two at a time while possible, in bursts */
@@ -848,7 +848,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
/* do any last ones */
while (nb_pkts) {
ice_vtx1(txdp, *pkt, flags, offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
diff --git a/drivers/net/ice/ice_rxtx_vec_avx512.c b/drivers/net/ice/ice_rxtx_vec_avx512.c
index add095ef06..9f1406fa98 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx512.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx512.c
@@ -1035,7 +1035,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkt,
/* do any last ones */
while (nb_pkts) {
ice_vtx1(txdp, *pkt, flags, do_offload);
- txdp++, pkt++, nb_pkts--;
+ txdp++; pkt++; nb_pkts--;
}
}
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-02-20 14:55:47.292445763 +0000
+++ 0107-net-intel-fix-comma-operator-warnings.patch 2026-02-20 14:55:43.372193922 +0000
@@ -1 +1 @@
-From 3dd316f03ec631cb3d1cc79347a69222840e7151 Mon Sep 17 00:00:00 2001
+From 6c9bf6e3508122ae95b5f2cad677c38943492c91 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3dd316f03ec631cb3d1cc79347a69222840e7151 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -26,11 +27,10 @@
- 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(-)
+ drivers/common/idpf/idpf_common_rxtx_avx512.c | 8 ++++----
+ drivers/net/i40e/i40e_ethdev.c | 10 ++++------
+ drivers/net/i40e/i40e_rxtx_vec_avx2.c | 4 ++--
+ drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
+ drivers/net/iavf/iavf_rxtx_vec_avx2.c | 4 ++--
+ drivers/net/iavf/iavf_rxtx_vec_avx512.c | 6 +++---
+ drivers/net/ice/ice_ethdev.c | 10 ++++------
+ drivers/net/ice/ice_rxtx_vec_avx2.c | 4 ++--
+ drivers/net/ice/ice_rxtx_vec_avx512.c | 2 +-
+ 9 files changed, 23 insertions(+), 27 deletions(-)
@@ -38,5 +38,45 @@
-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
-@@ -5108,16 +5108,14 @@ i40e_res_pool_destroy(struct i40e_res_pool_info *pool)
+diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
+index 9ea71c3718..b37702163a 100644
+--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
++++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
+@@ -1150,7 +1150,7 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
+ /* if unaligned on 32-bit boundary, do one to align */
+ if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
+ idpf_singleq_vtx1(txdp, *pkt, flags);
+- nb_pkts--, txdp++, pkt++;
++ nb_pkts--; txdp++; pkt++;
+ }
+
+ /* do 4 at a time while possible, in bursts */
+@@ -1188,7 +1188,7 @@ idpf_singleq_vtx(volatile struct idpf_base_tx_desc *txdp,
+ /* do any last ones */
+ while (nb_pkts) {
+ idpf_singleq_vtx1(txdp, *pkt, flags);
+- txdp++, pkt++, nb_pkts--;
++ txdp++; pkt++; nb_pkts--;
+ }
+ }
+
+@@ -1452,7 +1452,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
+ /* if unaligned on 32-bit boundary, do one to align */
+ if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
+ idpf_splitq_vtx1(txdp, *pkt, flags);
+- nb_pkts--, txdp++, pkt++;
++ nb_pkts--; txdp++; pkt++;
+ }
+
+ /* do 4 at a time while possible, in bursts */
+@@ -1490,7 +1490,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
+ /* do any last ones */
+ while (nb_pkts) {
+ idpf_splitq_vtx1(txdp, *pkt, flags);
+- txdp++, pkt++, nb_pkts--;
++ txdp++; pkt++; nb_pkts--;
+ }
+ }
+
+diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
+index 883c1a4f46..1405103d40 100644
+--- a/drivers/net/i40e/i40e_ethdev.c
++++ b/drivers/net/i40e/i40e_ethdev.c
+@@ -5107,16 +5107,14 @@ i40e_res_pool_destroy(struct i40e_res_pool_info *pool)
@@ -63,5 +103,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-index e1672c4371..88de303349 100644
---- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
-@@ -702,7 +702,7 @@ vtx(volatile struct ci_tx_desc *txdp,
+diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+index 3e95a6a1df..a75fc53e49 100644
+--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
++++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+@@ -708,7 +708,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -76 +116 @@
-@@ -729,7 +729,7 @@ vtx(volatile struct ci_tx_desc *txdp,
+@@ -735,7 +735,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -85,5 +125,5 @@
-diff --git a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-index bceb95ad2d..0c2e699a95 100644
---- a/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-+++ b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
-@@ -789,7 +789,7 @@ vtx(volatile struct ci_tx_desc *txdp,
+diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+index ae7bcb582b..372409e801 100644
+--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
++++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+@@ -915,7 +915,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
@@ -98,5 +138,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-index 374c713a94..2e18be3616 100644
---- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
-@@ -1653,7 +1653,7 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+index cdb48438da..83db5ef3cc 100644
+--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
++++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+@@ -1677,7 +1677,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -105 +145 @@
- iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
+ iavf_vtx1(txdp, *pkt, flags, offload);
@@ -111 +151 @@
-@@ -1694,7 +1694,7 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -1726,7 +1726,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -114 +154 @@
- iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
+ iavf_vtx1(txdp, *pkt, flags, offload);
@@ -120,5 +160,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
-index 01477fd501..9a93a0b062 100644
---- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
-+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
-@@ -1867,7 +1867,7 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+index d6a861bf80..5807755d8f 100644
+--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
++++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+@@ -1999,7 +1999,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -127 +167 @@
- iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
+ iavf_vtx1(txdp, *pkt, flags, offload);
@@ -133 +173 @@
-@@ -1903,7 +1903,7 @@ iavf_vtx(volatile struct ci_tx_desc *txdp,
+@@ -2043,7 +2043,7 @@ iavf_vtx(volatile struct iavf_tx_desc *txdp,
@@ -136 +176 @@
- iavf_vtx1(txdp, *pkt, flags, offload, vlan_flag);
+ iavf_vtx1(txdp, *pkt, flags, offload);
@@ -142 +182 @@
-@@ -2105,7 +2105,7 @@ ctx_vtx(volatile struct ci_tx_desc *txdp,
+@@ -2239,7 +2239,7 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
@@ -151,5 +191,5 @@
-diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c
-index ade13600de..41474b7002 100644
---- a/drivers/net/intel/ice/ice_ethdev.c
-+++ b/drivers/net/intel/ice/ice_ethdev.c
-@@ -945,16 +945,14 @@ ice_res_pool_destroy(struct ice_res_pool_info *pool)
+diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
+index 0796573f59..156a4fb78c 100644
+--- a/drivers/net/ice/ice_ethdev.c
++++ b/drivers/net/ice/ice_ethdev.c
+@@ -876,16 +876,14 @@ ice_res_pool_destroy(struct ice_res_pool_info *pool)
@@ -176,5 +216,5 @@
-diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-index d03f2e5b36..b72f69a47b 100644
---- a/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c
-@@ -796,7 +796,7 @@ ice_vtx(volatile struct ci_tx_desc *txdp,
+diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
+index 02bfb9b15d..d62a0b907c 100644
+--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
++++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
+@@ -803,7 +803,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
@@ -188,2 +228,2 @@
- /* do four at a time while possible, in bursts */
-@@ -833,7 +833,7 @@ ice_vtx(volatile struct ci_tx_desc *txdp,
+ /* do two at a time while possible, in bursts */
+@@ -848,7 +848,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp,
@@ -198,5 +238,5 @@
-diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
-index 004c01054a..309ab9fca7 100644
---- a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
-+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
-@@ -897,7 +897,7 @@ ice_vtx(volatile struct ci_tx_desc *txdp, struct rte_mbuf **pkt,
+diff --git a/drivers/net/ice/ice_rxtx_vec_avx512.c b/drivers/net/ice/ice_rxtx_vec_avx512.c
+index add095ef06..9f1406fa98 100644
+--- a/drivers/net/ice/ice_rxtx_vec_avx512.c
++++ b/drivers/net/ice/ice_rxtx_vec_avx512.c
+@@ -1035,7 +1035,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkt,
@@ -206,62 +245,0 @@
-- 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 411b171b97..e228b72fa5 100644
---- a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
-+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
-@@ -504,7 +504,7 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
- /* if unaligned on 32-bit boundary, do one to align */
- if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
- idpf_singleq_vtx1(txdp, *pkt, flags);
-- nb_pkts--, txdp++, pkt++;
-+ nb_pkts--; txdp++; pkt++;
- }
-
- /* do two at a time while possible, in bursts */
-@@ -537,7 +537,7 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
- /* do any last ones */
- 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 c5f2018924..fe870617bc 100644
---- a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
-+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
-@@ -1023,7 +1023,7 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
- /* if unaligned on 32-bit boundary, do one to align */
- if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
- idpf_singleq_vtx1(txdp, *pkt, flags);
-- nb_pkts--, txdp++, pkt++;
-+ nb_pkts--; txdp++; pkt++;
- }
-
- /* do 4 at a time while possible, in bursts */
-@@ -1053,7 +1053,7 @@ idpf_singleq_vtx(volatile struct ci_tx_desc *txdp,
- /* do any last ones */
- while (nb_pkts) {
- idpf_singleq_vtx1(txdp, *pkt, flags);
-- txdp++, pkt++, nb_pkts--;
-+ txdp++; pkt++; nb_pkts--;
- }
- }
-
-@@ -1215,7 +1215,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
- /* if unaligned on 32-bit boundary, do one to align */
- if (((uintptr_t)txdp & 0x1F) != 0 && nb_pkts != 0) {
- idpf_splitq_vtx1(txdp, *pkt, flags);
-- nb_pkts--, txdp++, pkt++;
-+ nb_pkts--; txdp++; pkt++;
- }
-
- /* do 4 at a time while possible, in bursts */
-@@ -1253,7 +1253,7 @@ idpf_splitq_vtx(volatile struct idpf_flex_tx_sched_desc *txdp,
- /* do any last ones */
- while (nb_pkts) {
- idpf_splitq_vtx1(txdp, *pkt, flags);
More information about the stable
mailing list