net/mlx5e: Fix RQ SW state layout in RQ devlink health diagnostics

Remove nesting level before RQ's SW state title and before RQ's SW
state capabilities line.

Preceding the RQ's SW state with a nameless nesting, wraps the inner SW
state map/dictionary with a nameless dictionary which is prohibited in
JSON file format.

Removing preceding SW state nest by removing function call
devlink_fmsg_obj_nest_start() and devlink_fmsg_obj_nest_end().

Signed-off-by: Adham Faris <afaris@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index a047a2a4ddacc6354a8ef3e958ee603ae4216003..e8eea9ffd5eb62582e5d8002cca6042a40303cfb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -259,10 +259,6 @@ static int mlx5e_health_rq_put_sw_state(struct devlink_fmsg *fmsg, struct mlx5e_
 
        BUILD_BUG_ON_MSG(ARRAY_SIZE(rq_sw_state_type_name) != MLX5E_NUM_RQ_STATES,
                         "rq_sw_state_type_name string array must be consistent with MLX5E_RQ_STATE_* enum in en.h");
-       err = devlink_fmsg_obj_nest_start(fmsg);
-       if (err)
-               return err;
-
        err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SW State");
        if (err)
                return err;
@@ -274,11 +270,7 @@ static int mlx5e_health_rq_put_sw_state(struct devlink_fmsg *fmsg, struct mlx5e_
                        return err;
        }
 
-       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
-       if (err)
-               return err;
-
-       return devlink_fmsg_obj_nest_end(fmsg);
+       return mlx5e_health_fmsg_named_obj_nest_end(fmsg);
 }
 
 static int