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

Commit 358d79a4 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5e: Handle matching on vlan priority for offloaded TC rules 



We ignored the vlan priority in offloaded TC rules matching part,
fix that.

Fixes: 095b6cfd ('net/mlx5e: Add TC vlan match parsing')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reported-by: default avatarPaul Blakey <paulb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abd32772

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -237,12 +237,15 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
			skb_flow_dissector_target(f->dissector,

			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_VLAN,

						  FLOW_DISSECTOR_KEY_VLAN,

						  f->mask);

						  f->mask);

		if (mask->vlan_id) {

		if (mask->vlan_id || mask->vlan_priority) {

			MLX5_SET(fte_match_set_lyr_2_4, headers_c, vlan_tag, 1);

			MLX5_SET(fte_match_set_lyr_2_4, headers_c, vlan_tag, 1);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, vlan_tag, 1);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, vlan_tag, 1);





			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, mask->vlan_id);

			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, mask->vlan_id);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, key->vlan_id);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, key->vlan_id);



			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_prio, mask->vlan_priority);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_prio, key->vlan_priority);

		}

		}

	}

	}