From: Roi Dayan Date: Thu, 12 Aug 2021 06:37:19 +0000 (+0300) Subject: net/mlx5e: Remove incorrect addition of action fwd flag X-Git-Tag: block-5.16-2021-11-13~96^2~372^2~8 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=475fb86ac941f75da127c19d8e8b282d33de9784;p=linux-2.6-block.git net/mlx5e: Remove incorrect addition of action fwd flag A user is expected to explicit request a fwd or drop action. It is not correct to implicit add a fwd action for the user, when modify header action flag exists. Signed-off-by: Roi Dayan Reviewed-by: Maor Dickman Signed-off-by: Saeed Mahameed --- diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index f55fc8553664..d68c67b98d94 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3491,9 +3491,6 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; } - if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) - attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; - if (!actions_match_supported(priv, flow_action, parse_attr, flow, extack)) return -EOPNOTSUPP;