Commit d4bb0531 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: TC, Set flow attr ip_version earlier 



Setting flow attr ip_version is not related to parsing tc flow actions.
It needs to be set after parsing flower matches which changes the spec.
So move it outside parse_tc_fdb_actions() and set it in
__mlx5e_add_fdb_flow().

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent df990477

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

+3 −3
Original line number Diff line number Diff line
@@ -4251,9 +4251,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;

	}



	/* always set IP version for indirect table handling */

	attr->ip_version = mlx5e_tc_get_ip_version(&parse_attr->spec, true);



	if (MLX5_CAP_GEN(esw->dev, prio_tag_required) &&

	    attr->action & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) {

		/* For prio tag mode, replace vlan pop with rewrite vlan prio
@@ -4488,6 +4485,9 @@ __mlx5e_add_fdb_flow(struct mlx5e_priv *priv, 
	if (err)

		goto err_free;



	/* always set IP version for indirect table handling */

	flow->attr->ip_version = mlx5e_tc_get_ip_version(&parse_attr->spec, true);



	err = parse_tc_fdb_actions(priv, &rule->action, flow, extack);

	if (err)

		goto err_free;