mlxsw: spectrum_acl: Move rehash_dis trace call and err msg to vregion_migrate()

Move the call of rehash_dis trace and the error message to
vregion_migrate() next to the failed_rollback flag set.

Signed-off-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_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index a26854f97f0f78108570731739e1db3fd0fb080e..a2af385bcd63e089a19f80a2bfb0561c0bb29cd0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -1394,8 +1394,12 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
                ctx->this_is_rollback = true;
                err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
                                                            ctx, credits);
-               if (err2)
+               if (err2) {
                        vregion->failed_rollback = true;
+                       trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,
+                                                                  vregion);
+                       dev_err(mlxsw_sp->bus_info->dev, "Failed to rollback during vregion migration fail\n");
+               }
        }
        mutex_unlock(&vregion->lock);
        trace_mlxsw_sp_acl_tcam_vregion_migrate_end(mlxsw_sp, vregion);
@@ -1503,11 +1507,6 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,
                                                ctx, credits);
        if (err) {
                dev_err(mlxsw_sp->bus_info->dev, "Failed to migrate vregion\n");
-               if (vregion->failed_rollback) {
-                       trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,
-                                                                  vregion);
-                       dev_err(mlxsw_sp->bus_info->dev, "Failed to rollback during vregion migration fail\n");
-               }
        }
 
        if (*credits >= 0)