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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/24/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/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
>From d73c0e33218758db1fb0db186393b367339f7af1 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 c8cd717992..c494f36578 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -618,5 +618,5 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"	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"
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 0d71e20c64..efa3b28766 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2253,14 +2253,14 @@ 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
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.847538583 +0000
+++ 0049-app-testpmd-fix-bonding-xmit-balance-policy-command.patch	2020-11-18 16:33:37.964215084 +0000
@@ -1 +1 @@
-From 393e557ea8401d925655eb6c7c91fc7a450dcf2b Mon Sep 17 00:00:00 2001
+From d73c0e33218758db1fb0db186393b367339f7af1 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 c8cd717992..c494f36578 100644
@@ -25 +26 @@
-@@ -650,5 +650,5 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -618,5 +618,5 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -33 +34 @@
-index 86aaf8fe0c..82d377ceed 100644
+index 0d71e20c64..efa3b28766 100644
@@ -36 +37 @@
-@@ -2606,14 +2606,14 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00:
+@@ -2253,14 +2253,14 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00: