mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_PRIORITY

The handler for FLOW_ACTION_PRIORITY 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: 463957e3fbab ("mlxsw: spectrum_flower: Offload FLOW_ACTION_PRIORITY")
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>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
index 2f76908cae730c4a1d5db47714107a7418f02962..69f77615c816901da6c94031b453c65714695dbe 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
@@ -155,9 +155,12 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
                                                           proto, prio, extack);
                        }
                case FLOW_ACTION_PRIORITY:
-                       return mlxsw_sp_acl_rulei_act_priority(mlxsw_sp, rulei,
-                                                              act->priority,
-                                                              extack);
+                       err = mlxsw_sp_acl_rulei_act_priority(mlxsw_sp, rulei,
+                                                             act->priority,
+                                                             extack);
+                       if (err)
+                               return err;
+                       break;
                case FLOW_ACTION_MANGLE: {
                        enum flow_action_mangle_base htype = act->mangle.htype;
                        __be32 be_mask = (__force __be32) act->mangle.mask;