Commit d0645b37 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix rejecting all egress rules not on vlan 



The original condition rejected all egress rules that
are not on tunnel device.
Also, the whole point of this egress reject was to disallow bad
rules because of egdev which doesn't exists today, so remove
this check entirely.

Fixes: 0a7fcb78 ("net/mlx5e: Support inner header rewrite with goto action")
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarOz Shlomo <ozsh@mellanox.com>
Reviewed-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 636bb968

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

+1 −14
Original line number Diff line number Diff line
@@ -3044,8 +3044,7 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
				    struct mlx5e_tc_flow *flow,

				    struct netlink_ext_ack *extack)

{

	struct net_device *filter_dev = parse_attr->filter_dev;

	bool drop_action, pop_action, ct_flow;

	bool ct_flow;

	u32 actions;



	ct_flow = flow_flag_test(flow, CT);
@@ -3064,18 +3063,6 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
		actions = flow->nic_attr->action;

	}



	drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;

	pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;



	if (flow_flag_test(flow, EGRESS) && !drop_action) {

		/* We only support filters on tunnel device, or on vlan

		 * devices if they have pop/drop action

		 */

		if (!mlx5e_get_tc_tun(filter_dev) ||

		    (is_vlan_dev(filter_dev) && !pop_action))

			return false;

	}



	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		return modify_header_match_supported(&parse_attr->spec,

						     flow_action, actions,