diff options
| author | Roi Dayan <roid@nvidia.com> | 2021-08-03 14:50:42 +0300 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@nvidia.com> | 2021-12-03 03:53:13 +0300 |
| commit | 3cc78411f3f4158fee710a7c606bf65a3f8ebb67 (patch) | |
| tree | 957ac87fe245f02b72ecee4536fd40b020974b07 /drivers/net/ethernet | |
| parent | 9745dbe03669cc05139c242faf9afa13fcf289f6 (diff) | |
| download | linux-3cc78411f3f4158fee710a7c606bf65a3f8ebb67.tar.xz | |
net/mlx5e: Remove redundant actions arg from validate_goto_chain()
Passing actions is redundant and can be retrieved from flow.
Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index d869907fdb70..90fca3555563 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3359,11 +3359,9 @@ add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv, static int validate_goto_chain(struct mlx5e_priv *priv, struct mlx5e_tc_flow *flow, const struct flow_action_entry *act, - u32 actions, struct netlink_ext_ack *extack) { bool is_esw = mlx5e_is_eswitch_flow(flow); - struct mlx5_flow_attr *attr = flow->attr; bool ft_flow = mlx5e_is_ft_flow(flow); u32 dest_chain = act->chain_index; struct mlx5_fs_chains *chains; @@ -3384,7 +3382,7 @@ static int validate_goto_chain(struct mlx5e_priv *priv, } if (!mlx5_chains_backwards_supported(chains) && - dest_chain <= attr->chain) { + dest_chain <= flow->attr->chain) { NL_SET_ERR_MSG_MOD(extack, "Goto lower numbered chain isn't supported"); return -EOPNOTSUPP; @@ -3396,8 +3394,8 @@ static int validate_goto_chain(struct mlx5e_priv *priv, return -EOPNOTSUPP; } - if (actions & (MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT | - MLX5_FLOW_CONTEXT_ACTION_DECAP) && + if (flow->attr->action & (MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT | + MLX5_FLOW_CONTEXT_ACTION_DECAP) && !reformat_and_fwd) { NL_SET_ERR_MSG_MOD(extack, "Goto chain is not allowed if action has reformat or decap"); @@ -3541,8 +3539,7 @@ parse_tc_nic_actions(struct mlx5e_priv *priv, } break; case FLOW_ACTION_GOTO: - err = validate_goto_chain(priv, flow, act, attr->action, - extack); + err = validate_goto_chain(priv, flow, act, extack); if (err) return err; @@ -4206,8 +4203,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, decap = true; break; case FLOW_ACTION_GOTO: - err = validate_goto_chain(priv, flow, act, attr->action, - extack); + err = validate_goto_chain(priv, flow, act, extack); if (err) return err; |