[dpdk-stable] patch 'app/testpmd: fix bonding xmit balance policy command' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 11/11/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.

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/c78e321342ce7fe8f6493d72f136a253ad547462

Thanks.

Luca Boccassi

---
>From c78e321342ce7fe8f6493d72f136a253ad547462 Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at huawei.com>
Date: Tue, 20 Oct 2020 11:04:16 +0800
Subject: [PATCH] app/testpmd: fix bonding xmit balance policy command

[ upstream commit 393e557ea8401d925655eb6c7c91fc7a450dcf2b ]

Currently there exists inconsistency about name of transmission
policy for a Link Bonding device. "xmit_balance_policy" is not
correct, which should be modified to "balance_xmit_policy".

Fixes: 2950a769315e ("bond: testpmd support")
Fixes: ac718398f477 ("doc: testpmd application user guide")

Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/cmdline.c                      | 2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index f522b599b7..9287fa3ea4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -614,7 +614,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set bonding mode IEEE802.3AD aggregator policy (port_id) (agg_name)"
 			"	Set Aggregation mode for IEEE802.3AD (mode 4)"
 
-			"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n"
+			"set bonding balance_xmit_policy (port_id) (l2|l23|l34)\n"
 			"	Set the transmit balance policy for bonded device running in balance mode.\n\n"
 
 			"set bonding mon_period (port_id) (value)\n"
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 78bdf60fe6..4dd29ee929 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2437,16 +2437,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00:
 
    testpmd> set bonding mac 10 00:00:00:00:00:01
 
-set bonding xmit_balance_policy
+set bonding balance_xmit_policy
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Set the transmission policy for a Link Bonding device when it is in Balance XOR mode::
 
-   testpmd> set bonding xmit_balance_policy (port_id) (l2|l23|l34)
+   testpmd> set bonding balance_xmit_policy (port_id) (l2|l23|l34)
 
 For example, set a Link Bonding device (port 10) to use a balance policy of layer 3+4 (IP addresses & UDP ports)::
 
-   testpmd> set bonding xmit_balance_policy 10 l34
+   testpmd> set bonding balance_xmit_policy 10 l34
 
 
 set bonding mon_period
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:12.246481038 +0000
+++ 0026-app-testpmd-fix-bonding-xmit-balance-policy-command.patch	2020-11-09 18:40:11.127311220 +0000
@@ -1 +1 @@
-From 393e557ea8401d925655eb6c7c91fc7a450dcf2b Mon Sep 17 00:00:00 2001
+From c78e321342ce7fe8f6493d72f136a253ad547462 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 393e557ea8401d925655eb6c7c91fc7a450dcf2b ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index d59c2b2c44..3f6d81c9a1 100644
+index f522b599b7..9287fa3ea4 100644
@@ -25 +26 @@
-@@ -649,7 +649,7 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -614,7 +614,7 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -35 +36 @@
-index 86aaf8fe0c..82d377ceed 100644
+index 78bdf60fe6..4dd29ee929 100644
@@ -38 +39 @@
-@@ -2605,16 +2605,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00:
+@@ -2437,16 +2437,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00: