[dpdk-stable] patch 'app/testpmd: fix PPPoE flow command' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. 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 175f707d92eae1f01ae0412ba22ac0e914e3f6c8 Mon Sep 17 00:00:00 2001
From: Xiao Zhang <xiao.zhang at intel.com>
Date: Tue, 31 Mar 2020 21:29:40 +0800
Subject: [PATCH] app/testpmd: fix PPPoE flow command

[ upstream commit c3ea098ae3a99fcf654432154ebc5b7a33866d89 ]

The command line to create RTE flow for specific proto_id of PPPOES can
not work.

It was:
testpmd> flow create 0 ingress pattern proto_id
 proto_id [TOKEN]: match PPPoE session protocol identifier
testpmd> flow create 0 ingress pattern proto_id proto_id
 proto_id [TOKEN]: match PPPoE session protocol identifier
testpmd> flow create 0 ingress pattern proto_id proto_id proto_id
 proto_id [TOKEN]: match PPPoE session protocol identifier

The proto_id can not be set with previous implementation.

This patch is to fix this issue, and change the command line to:
testpmd> flow create 0 pattern pppoe_proto_id is xxxx

Fixes: 226c6e60c35b ("ethdev: add PPPoE to flow API")

Signed-off-by: Xiao Zhang <xiao.zhang at intel.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 app/test-pmd/cmdline_flow.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index f059978730..deced65016 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -1005,7 +1005,6 @@ static const enum index item_pppoes[] = {
 };
 
 static const enum index item_pppoe_proto_id[] = {
-	ITEM_PPPOE_PROTO_ID,
 	ITEM_NEXT,
 	ZERO,
 };
@@ -2544,11 +2543,14 @@ static const struct token token_list[] = {
 					session_id)),
 	},
 	[ITEM_PPPOE_PROTO_ID] = {
-		.name = "proto_id",
+		.name = "pppoe_proto_id",
 		.help = "match PPPoE session protocol identifier",
 		.priv = PRIV_ITEM(PPPOE_PROTO_ID,
 				sizeof(struct rte_flow_item_pppoe_proto_id)),
-		.next = NEXT(item_pppoe_proto_id),
+		.next = NEXT(item_pppoe_proto_id, NEXT_ENTRY(UNSIGNED),
+			     item_param),
+		.args = ARGS(ARGS_ENTRY_HTON
+			     (struct rte_flow_item_pppoe_proto_id, proto_id)),
 		.call = parse_vc,
 	},
 	[ITEM_HIGIG2] = {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:47.064381159 +0100
+++ 0063-app-testpmd-fix-PPPoE-flow-command.patch	2020-05-19 14:04:44.220648445 +0100
@@ -1,8 +1,10 @@
-From c3ea098ae3a99fcf654432154ebc5b7a33866d89 Mon Sep 17 00:00:00 2001
+From 175f707d92eae1f01ae0412ba22ac0e914e3f6c8 Mon Sep 17 00:00:00 2001
 From: Xiao Zhang <xiao.zhang at intel.com>
 Date: Tue, 31 Mar 2020 21:29:40 +0800
 Subject: [PATCH] app/testpmd: fix PPPoE flow command
 
+[ upstream commit c3ea098ae3a99fcf654432154ebc5b7a33866d89 ]
+
 The command line to create RTE flow for specific proto_id of PPPOES can
 not work.
 
@@ -20,7 +22,6 @@
 testpmd> flow create 0 pattern pppoe_proto_id is xxxx
 
 Fixes: 226c6e60c35b ("ethdev: add PPPoE to flow API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiao Zhang <xiao.zhang at intel.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -29,10 +30,10 @@
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
-index 4877ac6c8a..e6ab8ff2f7 100644
+index f059978730..deced65016 100644
 --- a/app/test-pmd/cmdline_flow.c
 +++ b/app/test-pmd/cmdline_flow.c
-@@ -1037,7 +1037,6 @@ static const enum index item_pppoes[] = {
+@@ -1005,7 +1005,6 @@ static const enum index item_pppoes[] = {
  };
  
  static const enum index item_pppoe_proto_id[] = {
@@ -40,7 +41,7 @@
  	ITEM_NEXT,
  	ZERO,
  };
-@@ -2649,11 +2648,14 @@ static const struct token token_list[] = {
+@@ -2544,11 +2543,14 @@ static const struct token token_list[] = {
  					session_id)),
  	},
  	[ITEM_PPPOE_PROTO_ID] = {