Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f5d2536 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Use correct flags when configuring vlan 



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: e33dfe31 ("net/mlx5: E-Switch, Allow fine tuning of eswitch vport push/pop vlan")
Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent d886aba6

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1553,6 +1553,7 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw, 
				 struct mlx5_vport *vport)

				 struct mlx5_vport *vport)

{

{

	int vport_num = vport->vport;

	int vport_num = vport->vport;

	int flags;





	if (esw->manager_vport == vport_num)

	if (esw->manager_vport == vport_num)

		return;

		return;
@@ -1570,8 +1571,10 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw, 
						vport->info.node_guid);

						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,

	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 */

	/* Only legacy mode needs ACLs */

	if (esw->mode == SRIOV_LEGACY) {

	if (esw->mode == SRIOV_LEGACY) {