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

net/mlx5e: Move parse fdb check into actions_match_supported_fdb() 



The parse fdb/nic actions funcs parse the actions and then call
actions_match_supported() for final check.
Move related check in parse_tc_fdb_actions() into
actions_match_supported_fdb() for more organized code.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 9c1d3511

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

+11 −9
Original line number Diff line number Diff line
@@ -3175,13 +3175,14 @@ actions_match_supported_fdb(struct mlx5e_priv *priv, 
			    struct mlx5e_tc_flow *flow,

			    struct netlink_ext_ack *extack)

{

	struct mlx5_esw_flow_attr *esw_attr = flow->attr->esw_attr;

	bool ct_flow, ct_clear;



	ct_clear = flow->attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR;

	ct_flow = flow_flag_test(flow, CT) && !ct_clear;



	if (flow->attr->esw_attr->split_count && ct_flow &&

	    !MLX5_CAP_GEN(flow->attr->esw_attr->in_mdev, reg_c_preserve)) {

	if (esw_attr->split_count && ct_flow &&

	    !MLX5_CAP_GEN(esw_attr->in_mdev, reg_c_preserve)) {

		/* All registers used by ct are cleared when using

		 * split rules.

		 */
@@ -3189,6 +3190,14 @@ actions_match_supported_fdb(struct mlx5e_priv *priv, 
		return false;

	}



	if (esw_attr->split_count > 0 && !mlx5_esw_has_fwd_fdb(priv->mdev)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "current firmware doesn't support split rule for port mirroring");

		netdev_warn_once(priv->netdev,

				 "current firmware doesn't support split rule for port mirroring\n");

		return false;

	}



	return true;

}
@@ -4108,13 +4117,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;

	}



	if (esw_attr->split_count > 0 && !mlx5_esw_has_fwd_fdb(priv->mdev)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "current firmware doesn't support split rule for port mirroring");

		netdev_warn_once(priv->netdev, "current firmware doesn't support split rule for port mirroring\n");

		return -EOPNOTSUPP;

	}



	/* Allocate sample attribute only when there is a sample action and

	 * no errors after parsing.

	 */