[PATCH mlx5-next 11/18] net/mlx5: E-Switch, Use correct flags when configuring vlan

[Saeed Mahameed]

From: Bodong Wang <bod...@mellanox.com>

Before the offending commit, vlan will be configured if either vlan
or qos is set. After the change with new set flags, function callers
should provide flags accordingly.

Fixes: e33dfe316cf3 ("net/mlx5: E-Switch, Allow fine tuning of eswitch vport 
push/pop vlan")
Signed-off-by: Bodong Wang <bod...@mellanox.com>
Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c 
b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 67598272d4a9..0c75219d91b5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1553,6 +1553,7 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
                                 struct mlx5_vport *vport)
 {
        int vport_num = vport->vport;
+       int flags;
 
        if (esw->manager_vport == vport_num)
                return;
@@ -1570,8 +1571,10 @@ static void esw_apply_vport_conf(struct mlx5_eswitch 
*esw,
                                                vport->info.node_guid);
        }
 
+       flags = (vport->info.vlan || vport->info.qos) ?
+               SET_VLAN_STRIP | SET_VLAN_INSERT : 0;
        modify_esw_vport_cvlan(esw->dev, vport_num, vport->info.vlan, 
vport->info.qos,
-                              (vport->info.vlan || vport->info.qos));
+                              flags);
 
        /* Only legacy mode needs ACLs */
        if (esw->mode == SRIOV_LEGACY) {
-- 
2.21.0