]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5e: Remove incorrect addition of action fwd flag
authorRoi Dayan <roid@nvidia.com>
Thu, 12 Aug 2021 06:37:19 +0000 (09:37 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 16:56:24 +0000 (16:56 +0000)
[ Upstream commit 475fb86ac941f75da127c19d8e8b282d33de9784 ]

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 <roid@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: 0c101a23ca7e ("net/mlx5e: Fix pedit endianness")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index d123d9b4adf5eb3eb926bbfc9d351617c5828bc7..d13ffba138934772437014f7ec6ae8e03d3e7f3a 100644 (file)
@@ -3639,9 +3639,6 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
                return -EOPNOTSUPP;
        }
 
-       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;