patch 'app/testpmd: fix Tx retry in flowgen engine' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/92f8daa19fbabbdb847b4317db01f6cda791beb1

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 92f8daa19fbabbdb847b4317db01f6cda791beb1 Mon Sep 17 00:00:00 2001
From: Zhihong Wang <wangzhihong.wzh at bytedance.com>
Date: Fri, 13 Aug 2021 16:05:45 +0800
Subject: [PATCH] app/testpmd: fix Tx retry in flowgen engine

[ upstream commit ea275674a0c65dad334c8ab55ddd1d5a7e243af6 ]

Fix tx_pkt number in tx retry logic.

Fixes: bf56fce1fb45 ("app/testpmd: add retry option")

Signed-off-by: Zhihong Wang <wangzhihong.wzh at bytedance.com>
Acked-by: Xiaoyun Li <xiaoyun.li at intel.com>
---
 app/test-pmd/flowgen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 3e1335b627..ac00f61a92 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -186,12 +186,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 	/*
 	 * Retry if necessary
 	 */
-	if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) {
+	if (unlikely(nb_tx < nb_pkt) && fs->retry_enabled) {
 		retry = 0;
-		while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) {
+		while (nb_tx < nb_pkt && retry++ < burst_tx_retry_num) {
 			rte_delay_us(burst_tx_delay_time);
 			nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue,
-					&pkts_burst[nb_tx], nb_rx - nb_tx);
+					&pkts_burst[nb_tx], nb_pkt - nb_tx);
 		}
 	}
 	fs->tx_packets += nb_tx;
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:06.575406750 +0100
+++ 0007-app-testpmd-fix-Tx-retry-in-flowgen-engine.patch	2021-11-30 16:50:05.510871476 +0100
@@ -1 +1 @@
-From ea275674a0c65dad334c8ab55ddd1d5a7e243af6 Mon Sep 17 00:00:00 2001
+From 92f8daa19fbabbdb847b4317db01f6cda791beb1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea275674a0c65dad334c8ab55ddd1d5a7e243af6 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 3bf6e1ce97..f2e6255c36 100644
+index 3e1335b627..ac00f61a92 100644
@@ -21 +22 @@
-@@ -192,12 +192,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
+@@ -186,12 +186,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)