mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE

[ Upstream commit dcb60a114d25da0e213078b7bb35126143b700dd ]

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: da819ac7406f ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
index b607919c8ad02ce5f454de309ca1ff27238f9add..498de6ef6870512a90dc8f05511a7a2376745b98 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
@@ -123,9 +123,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;
                        }
                default:
                        NL_SET_ERR_MSG_MOD(extack, "Unsupported action");