Skip to content

Commit d0645b3

Browse files
roidayanSaeed Mahameed
authored andcommitted
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: 0a7fcb7 ("net/mlx5e: Support inner header rewrite with goto action") Signed-off-by: Roi Dayan <[email protected]> Reviewed-by: Oz Shlomo <[email protected]> Reviewed-by: Vlad Buslov <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 636bb96 commit d0645b3

File tree

1 file changed

+1
-14
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+1
-14
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,8 +3044,7 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
30443044
struct mlx5e_tc_flow *flow,
30453045
struct netlink_ext_ack *extack)
30463046
{
3047-
struct net_device *filter_dev = parse_attr->filter_dev;
3048-
bool drop_action, pop_action, ct_flow;
3047+
bool ct_flow;
30493048
u32 actions;
30503049

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

3067-
drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;
3068-
pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
3069-
3070-
if (flow_flag_test(flow, EGRESS) && !drop_action) {
3071-
/* We only support filters on tunnel device, or on vlan
3072-
* devices if they have pop/drop action
3073-
*/
3074-
if (!mlx5e_get_tc_tun(filter_dev) ||
3075-
(is_vlan_dev(filter_dev) && !pop_action))
3076-
return false;
3077-
}
3078-
30793066
if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
30803067
return modify_header_match_supported(&parse_attr->spec,
30813068
flow_action, actions,

0 commit comments

Comments
 (0)