Skip to content

Commit ccfc569

Browse files
pmachatadavem330
authored andcommitted
mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
The handler for FLOW_ACTION_VLAN_MANGLE ends by returning whatever the lower-level function that it calls returns. If there are more actions lined up after this action, those are never offloaded. Fix by only bailing out when the called function returns an error. Fixes: a150201 ("mlxsw: spectrum: Add support for vlan modify TC action") Signed-off-by: Petr Machata <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Signed-off-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0be0ae1 commit ccfc569

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,12 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
150150
u8 prio = act->vlan.prio;
151151
u16 vid = act->vlan.vid;
152152

153-
return mlxsw_sp_acl_rulei_act_vlan(mlxsw_sp, rulei,
154-
act->id, vid,
155-
proto, prio, extack);
153+
err = mlxsw_sp_acl_rulei_act_vlan(mlxsw_sp, rulei,
154+
act->id, vid,
155+
proto, prio, extack);
156+
if (err)
157+
return err;
158+
break;
156159
}
157160
case FLOW_ACTION_PRIORITY:
158161
err = mlxsw_sp_acl_rulei_act_priority(mlxsw_sp, rulei,

0 commit comments

Comments
 (0)