Commit c6719725 authored by Maor Dickman's avatar Maor Dickman Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Set destination vport vhca id only when merged eswitch is supported 



Destination vport vhca id is valid flag is set only merged eswitch isn't supported.
Change destination vport vhca id value to be set also only when merged eswitch
is supported.

Fixes: e4ad91f2 ("net/mlx5e: Split offloaded eswitch TC rules for port mirroring")
Signed-off-by: default avatarMaor Dickman <maord@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 90b22b9b

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

+4 −3
Original line number Diff line number Diff line
@@ -382,10 +382,11 @@ esw_setup_vport_dest(struct mlx5_flow_destination *dest, struct mlx5_flow_act *f 
{

	dest[dest_idx].type = MLX5_FLOW_DESTINATION_TYPE_VPORT;

	dest[dest_idx].vport.num = esw_attr->dests[attr_idx].rep->vport;

	if (MLX5_CAP_ESW(esw->dev, merged_eswitch)) {

		dest[dest_idx].vport.vhca_id =

			MLX5_CAP_GEN(esw_attr->dests[attr_idx].mdev, vhca_id);

	if (MLX5_CAP_ESW(esw->dev, merged_eswitch))

		dest[dest_idx].vport.flags |= MLX5_FLOW_DEST_VPORT_VHCA_ID;

	}

	if (esw_attr->dests[attr_idx].flags & MLX5_ESW_DEST_ENCAP) {

		if (pkt_reformat) {

			flow_act->action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;