patch 'app/testpmd: hide --bitrate-stats in help if disabled' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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/11/24. 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/2597a7df7c42e851ed9dbdc63ae01e0a5470963d

Thanks.

Kevin

---
>From 2597a7df7c42e851ed9dbdc63ae01e0a5470963d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 9 Jan 2024 15:09:27 -0800
Subject: [PATCH] app/testpmd: hide --bitrate-stats in help if disabled

[ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ]

Like other #ifdef options, bitrate-stats should not be printed
in help if not configured.

Also reordered latencystats help string to group it with bitrate-stats.

Fixes: e25e6c70fb56 ("app/testpmd: add --bitrate-stats option")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 app/test-pmd/parameters.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index e3c9757f3f..79ba728f69 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -113,8 +113,4 @@ usage(char* progname)
 	       "If the drop-queue doesn't exist, the packet is dropped. "
 	       "By default drop-queue=127.\n");
-#ifdef RTE_LIB_LATENCYSTATS
-	printf("  --latencystats=N: enable latency and jitter statistics "
-	       "monitoring on forwarding lcore id N.\n");
-#endif
 	printf("  --disable-crc-strip: disable CRC stripping by hardware.\n");
 	printf("  --enable-scatter: enable scattered Rx.\n");
@@ -177,6 +173,12 @@ usage(char* progname)
 	printf("  --no-lsc-interrupt: disable link status change interrupt.\n");
 	printf("  --no-rmv-interrupt: disable device removal interrupt.\n");
+#ifdef RTE_LIB_BITRATESTATS
 	printf("  --bitrate-stats=N: set the logical core N to perform "
 		"bit-rate calculation.\n");
+#endif
+#ifdef RTE_LIB_LATENCYSTATS
+	printf("  --latencystats=N: enable latency and jitter statistics "
+	       "monitoring on forwarding lcore id N.\n");
+#endif
 	printf("  --print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|flow_aged|all>: "
 	       "enable print of designated event or all of them.\n");
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 14:08:55.793175386 +0000
+++ 0048-app-testpmd-hide-bitrate-stats-in-help-if-disabled.patch	2024-03-05 14:08:54.674520829 +0000
@@ -1 +1 @@
-From e96491cb91fd048a79e848d713d65d45f0dde915 Mon Sep 17 00:00:00 2001
+From 2597a7df7c42e851ed9dbdc63ae01e0a5470963d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index a9ca58339d..11b0cce577 100644
+index e3c9757f3f..79ba728f69 100644
@@ -24,4 +25,3 @@
-@@ -101,8 +101,4 @@ usage(char* progname)
- 	printf("  --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer "
- 	       "port (0 <= X < %d).\n", RTE_MAX_ETHPORTS);
--#endif
+@@ -113,8 +113,4 @@ usage(char* progname)
+ 	       "If the drop-queue doesn't exist, the packet is dropped. "
+ 	       "By default drop-queue=127.\n");
@@ -31 +31 @@
- #endif
+-#endif
@@ -33 +33,2 @@
-@@ -168,6 +164,12 @@ usage(char* progname)
+ 	printf("  --enable-scatter: enable scattered Rx.\n");
+@@ -177,6 +173,12 @@ usage(char* progname)
@@ -44 +45 @@
- 	printf("  --print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|flow_aged|err_recovering|recovery_success|recovery_failed|all>: "
+ 	printf("  --print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|flow_aged|all>: "