From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5386EC7619A for ; Thu, 6 Apr 2023 02:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234938AbjDFCDm (ORCPT ); Wed, 5 Apr 2023 22:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234948AbjDFCDY (ORCPT ); Wed, 5 Apr 2023 22:03:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D56E618E for ; Wed, 5 Apr 2023 19:02:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8D34162CF0 for ; Thu, 6 Apr 2023 02:02:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E137EC433D2; Thu, 6 Apr 2023 02:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680746577; bh=Mp4JWhUZ6F74lH15VPfH7WdDoKGkd0UFlnOOeL+PoXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6s19FQfqLXaC1LzVAe05VQ3uDesViy/Od9iPIZk/NndAdXADbFC0JZ2zjGGd9RTr JqVDuOALSLVhuP9UIbBkNFAvmYeqfDl36qxaoQP0NN8mcKxycQlWLrZfjDxYNcWnzk nzqt5PYt6nSbAKvVgEudTwFXTgXDQ+kOt3Or5DQgx4iTvyzNxG0SUxm8a3OL25j/k7 YCHkQN4W/dVzBE2tvm/kppeBf6P5nE7gtJ/rstpB/nQl/Rsn3wVJMjuNM1pXI6NUW+ HN45r5f8dI/0VrGd/r1qZk3CenSfoMmMkm12UZ0hCyAGd0QNnJ0wnTqj7aqDSqHtru 2jiaSeZt+PJ1A== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: Saeed Mahameed , netdev@vger.kernel.org, Tariq Toukan , Adham Faris Subject: [net-next 15/15] net/mlx5e: Fix SQ SW state layout in SQ devlink health diagnostics Date: Wed, 5 Apr 2023 19:02:32 -0700 Message-Id: <20230406020232.83844-16-saeed@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406020232.83844-1-saeed@kernel.org> References: <20230406020232.83844-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Adham Faris Remove nesting level before SQ's SW state title and before SQ's SW state capabilities line. Preceding the SQ'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 Reviewed-by: Tariq Toukan Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c index 44c1926843a1..b35ff289af49 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c @@ -57,10 +57,6 @@ static int mlx5e_health_sq_put_sw_state(struct devlink_fmsg *fmsg, struct mlx5e_ BUILD_BUG_ON_MSG(ARRAY_SIZE(sq_sw_state_type_name) != MLX5E_NUM_SQ_STATES, "sq_sw_state_type_name string array must be consistent with MLX5E_SQ_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; @@ -72,11 +68,7 @@ static int mlx5e_health_sq_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 mlx5e_tx_reporter_err_cqe_recover(void *ctx) -- 2.39.2