[dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' 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/10/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/4d4942b0a24e17d3f662141f752fb814cd70ad77

Thanks.

Kevin.

---
>From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang at huawei.com>
Date: Fri, 25 Sep 2020 20:47:15 +0800
Subject: [PATCH] app/testpmd: fix VLAN configuration on failure

[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]

When failing to configure VLAN offloads after the port was started, there
is no need to update the port configuration. Currently, when user
configure an unsupported VLAN offloads and fails, and then restart the
port, it will fails since the configuration has been refreshed.

This patch makes the function return directly instead of refreshing the
configuration when execution fails.

Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration")

Signed-off-by: Chengchang Tang <tangchengchang at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/config.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 6c4a6423d5..e5945426fa 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_extend_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
@@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_strip_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
@@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_filter_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.860303505 +0000
+++ 0031-app-testpmd-fix-VLAN-configuration-on-failure.patch	2020-11-05 12:38:54.227896010 +0000
@@ -1 +1 @@
-From 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 Mon Sep 17 00:00:00 2001
+From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -21,2 +22,2 @@
- app/test-pmd/config.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
+ app/test-pmd/config.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
@@ -25 +26 @@
-index 03bf26bc94..0bec547f51 100644
+index 6c4a6423d5..e5945426fa 100644
@@ -28 +29 @@
-@@ -3510,7 +3510,9 @@ vlan_extend_set(portid_t port_id, int on)
+@@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on)
@@ -39 +40 @@
-@@ -3537,7 +3539,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
+@@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on)
@@ -50 +51 @@
-@@ -3578,7 +3582,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
+@@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on)
@@ -57,11 +57,0 @@
-+		return;
-+	}
- 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
- }
-@@ -3605,7 +3611,9 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on)
- 
- 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
--	if (diag < 0)
-+	if (diag < 0) {
- 		printf("%s(port_pi=%d, on=%d) failed "
- 	       "diag=%d\n", __func__, port_id, on, diag);