diff options
| author |  Petr Machata <petrm@mellanox.com>
| 2020-04-05 09:50:22 +0300 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2020-04-06 10:14:00 -0700 |
| commit | ccfc569347f870830e7c7cf854679a06cf9c45b5 (patch) | |
| tree | 5c37b95e4e40d8cc3c4cebadc00ee190212989de /drivers | |
| parent | mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_PRIORITY (diff) | |
| download | linux-ccfc569347f870830e7c7cf854679a06cf9c45b5.tar.gz linux-ccfc569347f870830e7c7cf854679a06cf9c45b5.tar.bz2 linux-ccfc569347f870830e7c7cf854679a06cf9c45b5.zip | |
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: a150201a70da ("mlxsw: spectrum: Add support for vlan modify TC action")
Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c index 69f77615c816..51117a5a6bbf 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c @@ -150,9 +150,12 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, u8 prio = act->vlan.prio; u16 vid = act->vlan.vid; - return mlxsw_sp_acl_rulei_act_vlan(mlxsw_sp, rulei, - act->id, vid, - proto, prio, extack); + err = mlxsw_sp_acl_rulei_act_vlan(mlxsw_sp, rulei, + act->id, vid, + proto, prio, extack); + if (err) + return err; + break; } case FLOW_ACTION_PRIORITY: err = mlxsw_sp_acl_rulei_act_priority(mlxsw_sp, rulei, |