[dpdk-stable] patch 'net/mlx5: fix blocker for push VLAN on Rx' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

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

Thanks.

Luca Boccassi

---
>From fb0f14db3a4b2d83992e974abc2e9c9c6df7cba5 Mon Sep 17 00:00:00 2001
From: Wisam Jaddo <wisamm at mellanox.com>
Date: Tue, 11 Feb 2020 15:20:06 +0200
Subject: [PATCH] net/mlx5: fix blocker for push VLAN on Rx

[ upstream commit a262726ed482f3c9fba493d0bfc3b4bd53d4c432 ]

The blocker should take FDB into consideration, since FDB all directions
have transfer ingress in it.

Fixes: 55060e62e4d2 ("net/mlx5: block push VLAN action on Rx")

Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
Acked-by: Raslan Darawsheh <rasland at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index df5e279ff4..f2c5f87fde 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1617,7 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
 {
 	const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;
 
-	if (attr->ingress)
+	if (!attr->transfer && attr->ingress)
 		return rte_flow_error_set(error, ENOTSUP,
 					  RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
 					  NULL,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.075988013 +0000
+++ 0027-net-mlx5-fix-blocker-for-push-VLAN-on-Rx.patch	2020-02-17 17:00:15.331950795 +0000
@@ -1,13 +1,14 @@
-From a262726ed482f3c9fba493d0bfc3b4bd53d4c432 Mon Sep 17 00:00:00 2001
+From fb0f14db3a4b2d83992e974abc2e9c9c6df7cba5 Mon Sep 17 00:00:00 2001
 From: Wisam Jaddo <wisamm at mellanox.com>
 Date: Tue, 11 Feb 2020 15:20:06 +0200
 Subject: [PATCH] net/mlx5: fix blocker for push VLAN on Rx
 
+[ upstream commit a262726ed482f3c9fba493d0bfc3b4bd53d4c432 ]
+
 The blocker should take FDB into consideration, since FDB all directions
 have transfer ingress in it.
 
 Fixes: 55060e62e4d2 ("net/mlx5: block push VLAN action on Rx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
 Acked-by: Raslan Darawsheh <rasland at mellanox.com>
@@ -16,10 +17,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index ba88325730..d88daeccbc 100644
+index df5e279ff4..f2c5f87fde 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1746,7 +1746,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
+@@ -1617,7 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
  {
  	const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;