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

Commit cf916ffb authored by Eli Cohen's avatar Eli Cohen Committed by Saeed Mahameed
Browse files

net/mlx5: Improve argument name for add flow API 



The last argument to mlx5_add_flow_rules passes the number of
destinations in the struct pointed to by the dest arg. Change the name
to better reflect this fact.

Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent a8274b85

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1876,7 +1876,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
		    struct mlx5_flow_spec *spec,

		    struct mlx5_flow_spec *spec,

		    struct mlx5_flow_act *flow_act,

		    struct mlx5_flow_act *flow_act,

		    struct mlx5_flow_destination *dest,

		    struct mlx5_flow_destination *dest,

		    int dest_num)

		    int num_dest)

{

{

	struct mlx5_flow_root_namespace *root = find_root(&ft->node);

	struct mlx5_flow_root_namespace *root = find_root(&ft->node);

	struct mlx5_flow_destination gen_dest = {};

	struct mlx5_flow_destination gen_dest = {};
@@ -1889,7 +1889,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
	if (flow_act->action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {

	if (flow_act->action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {

		if (!fwd_next_prio_supported(ft))

		if (!fwd_next_prio_supported(ft))

			return ERR_PTR(-EOPNOTSUPP);

			return ERR_PTR(-EOPNOTSUPP);

		if (dest_num)

		if (num_dest)

			return ERR_PTR(-EINVAL);

			return ERR_PTR(-EINVAL);

		mutex_lock(&root->chain_lock);

		mutex_lock(&root->chain_lock);

		next_ft = find_next_chained_ft(prio);

		next_ft = find_next_chained_ft(prio);
@@ -1897,7 +1897,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
			gen_dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

			gen_dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

			gen_dest.ft = next_ft;

			gen_dest.ft = next_ft;

			dest = &gen_dest;

			dest = &gen_dest;

			dest_num = 1;

			num_dest = 1;

			flow_act->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

			flow_act->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

		} else {

		} else {

			mutex_unlock(&root->chain_lock);

			mutex_unlock(&root->chain_lock);
@@ -1905,7 +1905,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
		}

		}

	}

	}





	handle = _mlx5_add_flow_rules(ft, spec, flow_act, dest, dest_num);

	handle = _mlx5_add_flow_rules(ft, spec, flow_act, dest, num_dest);





	if (sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {

	if (sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {

		if (!IS_ERR_OR_NULL(handle) &&

		if (!IS_ERR_OR_NULL(handle) &&

include/linux/mlx5/fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
		    struct mlx5_flow_spec *spec,

		    struct mlx5_flow_spec *spec,

		    struct mlx5_flow_act *flow_act,

		    struct mlx5_flow_act *flow_act,

		    struct mlx5_flow_destination *dest,

		    struct mlx5_flow_destination *dest,

		    int dest_num);

		    int num_dest);

void mlx5_del_flow_rules(struct mlx5_flow_handle *fr);

void mlx5_del_flow_rules(struct mlx5_flow_handle *fr);





int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler,

int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler,