[dpdk-stable] patch 'app/testpmd: fix help for loop topology option' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. 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.

Thanks.

Luca Boccassi

---
>From 54bbd07a7155851b21e7d840dd1ccd7771c50214 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 18 Oct 2019 16:45:40 +0100
Subject: [PATCH] app/testpmd: fix help for loop topology option

[ upstream commit e71df49e08f5b76513b3ee93583b9856a99ba2d8 ]

The testpmd --help option did not show all possible choices for port
topology previously. The loop topology option is now added.

Fixes: 3e2006d6186c ("app/testpmd: add loopback topology")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/parameters.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 1dfbcc4f99..8fcd72d297 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -168,8 +168,8 @@ usage(char* progname)
 	printf("  --disable-hw-vlan-extend: disable hardware vlan extend.\n");
 	printf("  --enable-drop-en: enable per queue packet drop.\n");
 	printf("  --disable-rss: disable rss.\n");
-	printf("  --port-topology=N: set port topology (N: paired (default) or "
-	       "chained).\n");
+	printf("  --port-topology=<paired|chained|loop>: set port topology (paired "
+	       "is default).\n");
 	printf("  --forward-mode=N: set forwarding mode (N: %s).\n",
 	       list_pkt_forwarding_modes());
 	printf("  --rss-ip: set RSS functions to IPv4/IPv6 only .\n");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.332542957 +0000
+++ 0076-app-testpmd-fix-help-for-loop-topology-option.patch	2019-12-19 14:32:26.173299174 +0000
@@ -1,13 +1,14 @@
-From e71df49e08f5b76513b3ee93583b9856a99ba2d8 Mon Sep 17 00:00:00 2001
+From 54bbd07a7155851b21e7d840dd1ccd7771c50214 Mon Sep 17 00:00:00 2001
 From: Ciara Power <ciara.power at intel.com>
 Date: Fri, 18 Oct 2019 16:45:40 +0100
 Subject: [PATCH] app/testpmd: fix help for loop topology option
 
+[ upstream commit e71df49e08f5b76513b3ee93583b9856a99ba2d8 ]
+
 The testpmd --help option did not show all possible choices for port
 topology previously. The loop topology option is now added.
 
 Fixes: 3e2006d6186c ("app/testpmd: add loopback topology")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ciara Power <ciara.power at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -16,11 +17,11 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
-index 5e55263eb4..9ea87c1471 100644
+index 1dfbcc4f99..8fcd72d297 100644
 --- a/app/test-pmd/parameters.c
 +++ b/app/test-pmd/parameters.c
-@@ -139,8 +139,8 @@ usage(char* progname)
- 	printf("  --enable-hw-qinq-strip: enable hardware qinq strip.\n");
+@@ -168,8 +168,8 @@ usage(char* progname)
+ 	printf("  --disable-hw-vlan-extend: disable hardware vlan extend.\n");
  	printf("  --enable-drop-en: enable per queue packet drop.\n");
  	printf("  --disable-rss: disable rss.\n");
 -	printf("  --port-topology=N: set port topology (N: paired (default) or "