[dpdk-stable] patch 'app/testpmd: fix metering and policing commands' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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

Yongseok

---
>From fa593134885ea8c9627203dbac45c81b8d760a87 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh at intel.com>
Date: Mon, 1 Oct 2018 11:46:04 +0100
Subject: [PATCH] app/testpmd: fix metering and policing commands

[ upstream commit a0f367eb06be643f30ab38cd62026513d656438d ]

Fixes bad arguments error for cli commands related to adding meter
profile for srtcm_rfc2697, trtcm_rfc2698 and trtcm_rfc4115.

error log:
testpmd> add port meter profile trtcm_rfc2698 2 0 3125000000
3125000000 2500000 2500000
Bad arguments

Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")

Signed-off-by: Jasvinder Singh <jasvinder.singh at intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/cmdline_mtr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index d8d806d7d..fc8279ffa 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -192,9 +192,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
 		(void *)&cmd_add_port_meter_profile_srtcm_port,
 		(void *)&cmd_add_port_meter_profile_srtcm_meter,
 		(void *)&cmd_add_port_meter_profile_srtcm_profile,
+		(void *)&cmd_add_port_meter_profile_srtcm_srtcm_rfc2697,
 		(void *)&cmd_add_port_meter_profile_srtcm_port_id,
 		(void *)&cmd_add_port_meter_profile_srtcm_profile_id,
-		(void *)&cmd_add_port_meter_profile_srtcm_srtcm_rfc2697,
 		(void *)&cmd_add_port_meter_profile_srtcm_cir,
 		(void *)&cmd_add_port_meter_profile_srtcm_cbs,
 		(void *)&cmd_add_port_meter_profile_srtcm_ebs,
@@ -299,9 +299,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
 		(void *)&cmd_add_port_meter_profile_trtcm_port,
 		(void *)&cmd_add_port_meter_profile_trtcm_meter,
 		(void *)&cmd_add_port_meter_profile_trtcm_profile,
+		(void *)&cmd_add_port_meter_profile_trtcm_trtcm_rfc2698,
 		(void *)&cmd_add_port_meter_profile_trtcm_port_id,
 		(void *)&cmd_add_port_meter_profile_trtcm_profile_id,
-		(void *)&cmd_add_port_meter_profile_trtcm_trtcm_rfc2698,
 		(void *)&cmd_add_port_meter_profile_trtcm_cir,
 		(void *)&cmd_add_port_meter_profile_trtcm_pir,
 		(void *)&cmd_add_port_meter_profile_trtcm_cbs,
@@ -411,9 +411,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_meter,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile,
+		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_trtcm_rfc4115,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port_id,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile_id,
-		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_trtcm_rfc4115,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_cir,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_eir,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_cbs,
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.324709703 -0800
+++ 0008-app-testpmd-fix-metering-and-policing-commands.patch	2019-01-11 02:29:10.723971000 -0800
@@ -1,8 +1,10 @@
-From a0f367eb06be643f30ab38cd62026513d656438d Mon Sep 17 00:00:00 2001
+From fa593134885ea8c9627203dbac45c81b8d760a87 Mon Sep 17 00:00:00 2001
 From: Jasvinder Singh <jasvinder.singh at intel.com>
 Date: Mon, 1 Oct 2018 11:46:04 +0100
 Subject: [PATCH] app/testpmd: fix metering and policing commands
 
+[ upstream commit a0f367eb06be643f30ab38cd62026513d656438d ]
+
 Fixes bad arguments error for cli commands related to adding meter
 profile for srtcm_rfc2697, trtcm_rfc2698 and trtcm_rfc4115.
 
@@ -12,7 +14,6 @@
 Bad arguments
 
 Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jasvinder Singh <jasvinder.singh at intel.com>
 Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
@@ -21,10 +22,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
-index f908fb352..32a47305f 100644
+index d8d806d7d..fc8279ffa 100644
 --- a/app/test-pmd/cmdline_mtr.c
 +++ b/app/test-pmd/cmdline_mtr.c
-@@ -414,9 +414,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
+@@ -192,9 +192,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
  		(void *)&cmd_add_port_meter_profile_srtcm_port,
  		(void *)&cmd_add_port_meter_profile_srtcm_meter,
  		(void *)&cmd_add_port_meter_profile_srtcm_profile,
@@ -35,7 +36,7 @@
  		(void *)&cmd_add_port_meter_profile_srtcm_cir,
  		(void *)&cmd_add_port_meter_profile_srtcm_cbs,
  		(void *)&cmd_add_port_meter_profile_srtcm_ebs,
-@@ -521,9 +521,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
+@@ -299,9 +299,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
  		(void *)&cmd_add_port_meter_profile_trtcm_port,
  		(void *)&cmd_add_port_meter_profile_trtcm_meter,
  		(void *)&cmd_add_port_meter_profile_trtcm_profile,
@@ -46,7 +47,7 @@
  		(void *)&cmd_add_port_meter_profile_trtcm_cir,
  		(void *)&cmd_add_port_meter_profile_trtcm_pir,
  		(void *)&cmd_add_port_meter_profile_trtcm_cbs,
-@@ -633,9 +633,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
+@@ -411,9 +411,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port,
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_meter,
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile,