[dpdk-stable] patch 'app/testpmd: rename ambiguous VF config variable' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 09/12/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/2b0c72026751c24b726bc7be0fb89ca42b2a858e

Thanks.

Kevin Traynor

---
>From 2b0c72026751c24b726bc7be0fb89ca42b2a858e Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 26 Jul 2019 09:59:49 +0200
Subject: [PATCH] app/testpmd: rename ambiguous VF config variable

[ upstream commit 5e16d9447a1e3404abd38fe4da6ea4f6c8addd05 ]

Caught while looking at the rx offloads code.

rx_mode is a global variable for the default rx configuration.
Rename the local rx_mode variable in cmd_set_vf_rxmode_parsed.

Fixes: 7741e4cf16c0 ("app/testpmd: VMDq and DCB updates")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/cmdline.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2eb2fd6ae..8a6f246b4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8368,5 +8368,5 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
 {
 	int ret = -ENOTSUP;
-	uint16_t rx_mode = 0;
+	uint16_t vf_rxmode = 0;
 	struct cmd_set_vf_rxmode *res = parsed_result;
 
@@ -8374,11 +8374,11 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
 	if (!strcmp(res->what,"rxmode")) {
 		if (!strcmp(res->mode, "AUPE"))
-			rx_mode |= ETH_VMDQ_ACCEPT_UNTAG;
+			vf_rxmode |= ETH_VMDQ_ACCEPT_UNTAG;
 		else if (!strcmp(res->mode, "ROPE"))
-			rx_mode |= ETH_VMDQ_ACCEPT_HASH_UC;
+			vf_rxmode |= ETH_VMDQ_ACCEPT_HASH_UC;
 		else if (!strcmp(res->mode, "BAM"))
-			rx_mode |= ETH_VMDQ_ACCEPT_BROADCAST;
+			vf_rxmode |= ETH_VMDQ_ACCEPT_BROADCAST;
 		else if (!strncmp(res->mode, "MPE",3))
-			rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
+			vf_rxmode |= ETH_VMDQ_ACCEPT_MULTICAST;
 	}
 
@@ -8388,10 +8388,10 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
 	if (ret == -ENOTSUP)
 		ret = rte_pmd_ixgbe_set_vf_rxmode(res->port_id, res->vf_id,
-						  rx_mode, (uint8_t)is_on);
+						  vf_rxmode, (uint8_t)is_on);
 #endif
 #ifdef RTE_LIBRTE_BNXT_PMD
 	if (ret == -ENOTSUP)
 		ret = rte_pmd_bnxt_set_vf_rxmode(res->port_id, res->vf_id,
-						 rx_mode, (uint8_t)is_on);
+						 vf_rxmode, (uint8_t)is_on);
 #endif
 	if (ret < 0)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:48.666007258 +0100
+++ 0019-app-testpmd-rename-ambiguous-VF-config-variable.patch	2019-09-05 10:36:47.513700450 +0100
@@ -1 +1 @@
-From 5e16d9447a1e3404abd38fe4da6ea4f6c8addd05 Mon Sep 17 00:00:00 2001
+From 2b0c72026751c24b726bc7be0fb89ca42b2a858e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5e16d9447a1e3404abd38fe4da6ea4f6c8addd05 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index a28362d88..56783aa13 100644
+index 2eb2fd6ae..8a6f246b4 100644
@@ -24 +25 @@
-@@ -8524,5 +8524,5 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
+@@ -8368,5 +8368,5 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
@@ -31 +32 @@
-@@ -8530,11 +8530,11 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
+@@ -8374,11 +8374,11 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
@@ -47 +48 @@
-@@ -8544,10 +8544,10 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
+@@ -8388,10 +8388,10 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,