Commit 70f478ca authored Apr 01, 2020 by Dmytro Linkin Committed by Saeed Mahameed Apr 08, 2020

net/mlx5e: Fix nest_level for vlan pop action



Current value of nest_level, assigned from net_device lower_level value,
does not reflect the actual number of vlan headers, needed to pop.
For ex., if we have untagged ingress traffic sended over vlan devices,
instead of one pop action, driver will perform two pop actions.
To fix that, calculate nest_level as difference between vlan device and
parent device lower_levels.

Fixes: f3b0a18b ("net: remove unnecessary variables and callback")
Signed-off-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

parent d19987cc

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -3558,12 +3558,13 @@ static int add_vlan_pop_action(struct mlx5e_priv *priv,
		struct mlx5_esw_flow_attr *attr,
		u32 *action)
		{
		int nest_level = attr->parse_attr->filter_dev->lower_level;
		struct flow_action_entry vlan_act = {
		.id = FLOW_ACTION_VLAN_POP,
		};
		int err = 0;
		int nest_level, err = 0;

		nest_level = attr->parse_attr->filter_dev->lower_level -
		priv->netdev->lower_level;
		while (nest_level--) {
		err = parse_tc_vlan_action(priv, &vlan_act, attr, action);
		if (err)

Admin message