[dpdk-stable] patch 'app/testpmd: fix csum parse-tunnel command invocation' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From a648fad2b0d5ad47e23bba7831892235b0b8474d Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerin.jacob at caviumnetworks.com>
Date: Tue, 2 Oct 2018 19:05:47 +0530
Subject: [PATCH] app/testpmd: fix csum parse-tunnel command invocation

[ upstream commit 5b48cd159536b70a943ae8246c2f717183818b19 ]

Based on the documentation and help print, the sub command
for csum suppose to be "parse-tunnel" instead of "parse_tunnel".

Fixes: 64fc36064dc3 ("app/testpmd: add csum parse-tunnel command")

Signed-off-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/cmdline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7dbe2456a5..27e3757330 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -3501,7 +3501,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_csum =
 				csum, "csum");
 cmdline_parse_token_string_t cmd_csum_tunnel_parse =
 	TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
-				parse, "parse_tunnel");
+				parse, "parse-tunnel");
 cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
 	TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
 				onoff, "on#off");
@@ -3513,7 +3513,7 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
 	.f = cmd_csum_tunnel_parsed,
 	.data = NULL,
 	.help_str = "enable/disable parsing of tunnels for csum engine: "
-	"csum parse_tunnel on|off <tx-port>",
+	"csum parse-tunnel on|off <tx-port>",
 	.tokens = {
 		(void *)&cmd_csum_tunnel_csum,
 		(void *)&cmd_csum_tunnel_parse,
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:35.083064102 +0100
+++ 0019-app-testpmd-fix-csum-parse-tunnel-command-invocation.patch	2018-10-15 12:48:34.589096016 +0100
@@ -1,13 +1,14 @@
-From 5b48cd159536b70a943ae8246c2f717183818b19 Mon Sep 17 00:00:00 2001
+From a648fad2b0d5ad47e23bba7831892235b0b8474d Mon Sep 17 00:00:00 2001
 From: Jerin Jacob <jerin.jacob at caviumnetworks.com>
 Date: Tue, 2 Oct 2018 19:05:47 +0530
 Subject: [PATCH] app/testpmd: fix csum parse-tunnel command invocation
 
+[ upstream commit 5b48cd159536b70a943ae8246c2f717183818b19 ]
+
 Based on the documentation and help print, the sub command
 for csum suppose to be "parse-tunnel" instead of "parse_tunnel".
 
 Fixes: 64fc36064dc3 ("app/testpmd: add csum parse-tunnel command")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
 Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
-index 0c5399dc46..3376a665cf 100644
+index 7dbe2456a5..27e3757330 100644
 --- a/app/test-pmd/cmdline.c
 +++ b/app/test-pmd/cmdline.c
-@@ -4367,7 +4367,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_csum =
+@@ -3501,7 +3501,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_csum =
  				csum, "csum");
  cmdline_parse_token_string_t cmd_csum_tunnel_parse =
  	TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
@@ -28,15 +29,15 @@
  cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
  	TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
  				onoff, "on#off");
-@@ -4378,7 +4378,7 @@ cmdline_parse_token_num_t cmd_csum_tunnel_portid =
- cmdline_parse_inst_t cmd_csum_tunnel = {
+@@ -3513,7 +3513,7 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
  	.f = cmd_csum_tunnel_parsed,
  	.data = NULL,
--	.help_str = "csum parse_tunnel on|off <port_id>: "
-+	.help_str = "csum parse-tunnel on|off <port_id>: "
- 		"Enable/Disable parsing of tunnels for csum engine",
+ 	.help_str = "enable/disable parsing of tunnels for csum engine: "
+-	"csum parse_tunnel on|off <tx-port>",
++	"csum parse-tunnel on|off <tx-port>",
  	.tokens = {
  		(void *)&cmd_csum_tunnel_csum,
+ 		(void *)&cmd_csum_tunnel_parse,
 -- 
 2.19.1