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

net/mlx5e: Remove redundant parse_attr arg 



Passing parse_attr is redundant in parse_tc_nic_actions() and
mlx5e_tc_add_nic_flow() as we can get it from flow.
This is the same as with parse_tc_fdb_actions() and mlx5e_tc_add_fdb_flow().

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 950b4df9

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

+7 −5
Original line number Diff line number Diff line
@@ -1031,15 +1031,17 @@ mlx5e_add_offloaded_nic_rule(struct mlx5e_priv *priv, 


static int

mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,

		      struct mlx5e_tc_flow_parse_attr *parse_attr,

		      struct mlx5e_tc_flow *flow,

		      struct netlink_ext_ack *extack)

{

	struct mlx5e_tc_flow_parse_attr *parse_attr;

	struct mlx5_flow_attr *attr = flow->attr;

	struct mlx5_core_dev *dev = priv->mdev;

	struct mlx5_fc *counter = NULL;

	int err;



	parse_attr = attr->parse_attr;



	if (flow_flag_test(flow, HAIRPIN)) {

		err = mlx5e_hairpin_flow_add(priv, flow, parse_attr, extack);

		if (err)
@@ -3327,10 +3329,10 @@ static int validate_goto_chain(struct mlx5e_priv *priv, 


static int parse_tc_nic_actions(struct mlx5e_priv *priv,

				struct flow_action *flow_action,

				struct mlx5e_tc_flow_parse_attr *parse_attr,

				struct mlx5e_tc_flow *flow,

				struct netlink_ext_ack *extack)

{

	struct mlx5e_tc_flow_parse_attr *parse_attr;

	struct mlx5_flow_attr *attr = flow->attr;

	struct pedit_headers_action hdrs[2] = {};

	const struct flow_action_entry *act;
@@ -3346,8 +3348,8 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;



	nic_attr = attr->nic_attr;



	nic_attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;

	parse_attr = attr->parse_attr;



	flow_action_for_each(i, act, flow_action) {

		switch (act->id) {
@@ -4418,11 +4420,11 @@ mlx5e_add_nic_flow(struct mlx5e_priv *priv, 
	if (err)

		goto err_free;



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

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

	if (err)

		goto err_free;



	err = mlx5e_tc_add_nic_flow(priv, parse_attr, flow, extack);

	err = mlx5e_tc_add_nic_flow(priv, flow, extack);

	if (err)

		goto err_free;