Commit 7b919caa authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Paolo Abeni
Browse files

net/mlx5: fs, rename modify header struct member action 



As preparation for HW Steering support, rename modify header struct
member action to fs_dr_action, to distinguish from fs_hws_action which
will be added. Add a pointer where needed to keep code line shorter and
more readable.

Reviewed-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 1715f0a7

drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ mlx5_ct_fs_smfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, 
	}



	actions[num_actions++] = smfs_rule->count_action;

	actions[num_actions++] = attr->modify_hdr->action.dr_action;

	actions[num_actions++] = attr->modify_hdr->fs_dr_action.dr_action;

	actions[num_actions++] = fs_smfs->fwd_action;



	nat = (attr->ft == fs_smfs->ct_nat);
@@ -379,7 +379,7 @@ static int mlx5_ct_fs_smfs_ct_rule_update(struct mlx5_ct_fs *fs, struct mlx5_ct_ 
	struct mlx5dr_rule *rule;



	actions[0] = smfs_rule->count_action;

	actions[1] = attr->modify_hdr->action.dr_action;

	actions[1] = attr->modify_hdr->fs_dr_action.dr_action;

	actions[2] = fs_smfs->fwd_action;



	rule = mlx5_smfs_rule_create(smfs_rule->smfs_matcher->dr_matcher, spec,

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct mlx5_modify_hdr { 
	enum mlx5_flow_namespace_type ns_type;

	enum mlx5_flow_resource_owner owner;

	union {

		struct mlx5_fs_dr_action action;

		struct mlx5_fs_dr_action fs_dr_action;

		u32 id;

	};

};

drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c

+7 −5
Original line number Diff line number Diff line
@@ -372,9 +372,11 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, 
		actions[num_actions++] = tmp_action;

	}



	if (fte->act_dests.action.action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		actions[num_actions++] =

			fte->act_dests.action.modify_hdr->action.dr_action;

	if (fte->act_dests.action.action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {

		struct mlx5_modify_hdr *modify_hdr = fte->act_dests.action.modify_hdr;



		actions[num_actions++] = modify_hdr->fs_dr_action.dr_action;

	}



	if (fte->act_dests.action.action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH) {

		tmp_action = create_action_push_vlan(domain, &fte->act_dests.action.vlan[0]);
@@ -705,7 +707,7 @@ static int mlx5_cmd_dr_modify_header_alloc(struct mlx5_flow_root_namespace *ns, 
	}



	modify_hdr->owner = MLX5_FLOW_RESOURCE_OWNER_SW;

	modify_hdr->action.dr_action = action;

	modify_hdr->fs_dr_action.dr_action = action;



	return 0;

}
@@ -713,7 +715,7 @@ static int mlx5_cmd_dr_modify_header_alloc(struct mlx5_flow_root_namespace *ns, 
static void mlx5_cmd_dr_modify_header_dealloc(struct mlx5_flow_root_namespace *ns,

					      struct mlx5_modify_hdr *modify_hdr)

{

	mlx5dr_action_destroy(modify_hdr->action.dr_action);

	mlx5dr_action_destroy(modify_hdr->fs_dr_action.dr_action);

}



static int