[dpdk-stable] patch 'app/testpmd: fix CRC strip command' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

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/16/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0a72a7de14dcccbf0ec925d5744e43fdbae20c5a

Thanks.

Kevin.

---
>From 0a72a7de14dcccbf0ec925d5744e43fdbae20c5a Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu at intel.com>
Date: Tue, 15 Oct 2019 09:14:20 +0000
Subject: [PATCH] app/testpmd: fix CRC strip command

[ upstream commit 5e913bdb4f4d05f90ca99467444f11633c78749a ]

This patch fixed the bug that a failure appeared when config
rx_offload crc_strip using command "port config all crc-strip
on|off". The reason is that this command was removed in Commit
e5db17a1e54e. The current command is "port config <port_id>
rx_offload keep_crc on|off" instead.

In this patch, some codes left over about 'crc_strip' are
removed to make the current command clearer.

Fixes: e5db17a1e54e ("app/testpmd: remove duplicated Rx offload commands")

Signed-off-by: Ting Xu <ting.xu at intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/cmdline.c                      | 12 ++++++------
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7f13309ad..7c90457cd 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -875,5 +875,5 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
 			"outer_ipv4_cksum|macsec_strip|header_split|"
-			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"vlan_filter|vlan_extend|jumbo_frame|"
 			"scatter|timestamp|security|keep_crc on|off\n"
 			"     Enable or disable a per port Rx offloading"
@@ -883,5 +883,5 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
 			"outer_ipv4_cksum|macsec_strip|header_split|"
-			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"vlan_filter|vlan_extend|jumbo_frame|"
 			"scatter|timestamp|security|keep_crc on|off\n"
 			"    Enable or disable a per queue Rx offloading"
@@ -17809,5 +17809,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
 			   "qinq_strip#outer_ipv4_cksum#macsec_strip#"
 			   "header_split#vlan_filter#vlan_extend#jumbo_frame#"
-			   "crc_strip#scatter#timestamp#security#keep_crc");
+			   "scatter#timestamp#security#keep_crc");
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off =
 	TOKEN_STRING_INITIALIZER
@@ -17885,5 +17885,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
 		    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
 		    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-		    "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+		    "jumbo_frame|scatter|timestamp|security|keep_crc "
 		    "on|off",
 	.tokens = {
@@ -17935,5 +17935,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
 			   "qinq_strip#outer_ipv4_cksum#macsec_strip#"
 			   "header_split#vlan_filter#vlan_extend#jumbo_frame#"
-			   "crc_strip#scatter#timestamp#security#keep_crc");
+			   "scatter#timestamp#security#keep_crc");
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
 	TOKEN_STRING_INITIALIZER
@@ -17987,5 +17987,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
 		    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
 		    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-		    "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+		    "jumbo_frame|scatter|timestamp|security|keep_crc "
 		    "on|off",
 	.tokens = {
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 3db8c4882..37d5d876b 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1602,5 +1602,5 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
                   qinq_strip, outer_ipv4_cksum, macsec_strip,
                   header_split, vlan_filter, vlan_extend, jumbo_frame,
-                  crc_strip, scatter, timestamp, security, keep_crc
+                  scatter, timestamp, security, keep_crc
 
 This command should be run when the port is stopped, or else it will fail.
@@ -1617,5 +1617,5 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::
                   qinq_strip, outer_ipv4_cksum, macsec_strip,
                   header_split, vlan_filter, vlan_extend, jumbo_frame,
-                  crc_strip, scatter, timestamp, security, keep_crc
+                  scatter, timestamp, security, keep_crc
 
 This command should be run when the port is stopped, or else it will fail.
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:39.157144981 +0000
+++ 0001-app-testpmd-fix-CRC-strip-command.patch	2019-12-10 14:49:38.975459203 +0000
@@ -1 +1 @@
-From 5e913bdb4f4d05f90ca99467444f11633c78749a Mon Sep 17 00:00:00 2001
+From 0a72a7de14dcccbf0ec925d5744e43fdbae20c5a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5e913bdb4f4d05f90ca99467444f11633c78749a ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 514372932..a18402de5 100644
+index 7f13309ad..7c90457cd 100644
@@ -29 +30 @@
-@@ -850,5 +850,5 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -875,5 +875,5 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -36 +37 @@
-@@ -858,5 +858,5 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -883,5 +883,5 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -43 +44 @@
-@@ -18072,5 +18072,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
+@@ -17809,5 +17809,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
@@ -50 +51 @@
-@@ -18152,5 +18152,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
+@@ -17885,5 +17885,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
@@ -57 +58 @@
-@@ -18202,5 +18202,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
+@@ -17935,5 +17935,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
@@ -64 +65 @@
-@@ -18258,5 +18258,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
+@@ -17987,5 +17987,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
@@ -72 +73 @@
-index 28b47e6cb..1da60faff 100644
+index 3db8c4882..37d5d876b 100644
@@ -75 +76 @@
-@@ -1654,5 +1654,5 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
+@@ -1602,5 +1602,5 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
@@ -82 +83 @@
-@@ -1669,5 +1669,5 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::
+@@ -1617,5 +1617,5 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::