Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit badacb78 authored by Or Gerlitz's avatar Or Gerlitz Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: Return error if prio is specified when offloading eswitch vlan push 



[ Upstream commit 001a2fc0c8cc29241305e44ffbce52d1daf8782b ]

This isn't supported when we emulate eswitch vlan push action which
is the current state of things.

Fixes: 8b32580d ('net/mlx5e: Add TC vlan action for SRIOV offloads')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e9f41ac

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

+2 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,8 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 
			if (tcf_vlan_action(a) == TCA_VLAN_ACT_POP) {

				attr->action |= MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;

			} else if (tcf_vlan_action(a) == TCA_VLAN_ACT_PUSH) {

				if (tcf_vlan_push_proto(a) != htons(ETH_P_8021Q))

				if (tcf_vlan_push_proto(a) != htons(ETH_P_8021Q) ||

				    tcf_vlan_push_prio(a))

					return -EOPNOTSUPP;



				attr->action |= MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH;