From patchwork Fri Jan 8 05:30:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 12005767 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 519EFC433DB for ; Fri, 8 Jan 2021 05:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A192233EE for ; Fri, 8 Jan 2021 05:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727272AbhAHFbi (ORCPT ); Fri, 8 Jan 2021 00:31:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:35752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727001AbhAHFbh (ORCPT ); Fri, 8 Jan 2021 00:31:37 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2573B23406; Fri, 8 Jan 2021 05:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610083857; bh=PRD0C0CukMOoliU1TJTVvJ7qCD21WQBO6LpD3X7upIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ks+y6OuX0XFs8TKF/ZGPhEw+0wkwvFm2m1FmZW3c2c5Th6UErI/YSbTVK4h/IONPS abglZCRP8qN8InBc3SrjNQSdGPxOkNoxAoWdh9Ind+0V9tLNHnuE73Tm+U+E122Nnc cJrOvLc9bM2QlfO2PIZ2I1uF9QZX0L6QFukQxqbydGOZxBon1sawUm9LOOGqRsoEC1 MTT+/KwoNwvdtFUTbKGjpdB9GiBQHU/9xYre+XxjwBCiqneYbXr0/p7PdrEUgwluVL Klrc9t5L3BPjZ+jWpACr3DBDhraoH93NgauF9gMuYViSX6nrNkpJzotFKDKLztq5Ow X8a0FkRZGlvTQ== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Eli Cohen , Roi Dayan , Saeed Mahameed Subject: [net-next 02/15] net/mlx5e: Simplify condition on esw_vport_enable_qos() Date: Thu, 7 Jan 2021 21:30:41 -0800 Message-Id: <20210108053054.660499-3-saeed@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210108053054.660499-1-saeed@kernel.org> References: <20210108053054.660499-1-saeed@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eli Cohen esw->qos.enabled will only be true if both MLX5_CAP_GEN(dev, qos) and MLX5_CAP_QOS(dev, esw_scheduling) are true. Therefore, remove them from the condition in and rely only on esw->qos.enabled. Fixes: 1bd27b11c1df ("net/mlx5: Introduce E-switch QoS management") Signed-off-by: Eli Cohen Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index da901e364656..876e6449edb3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1042,8 +1042,7 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, void *vport_elem; int err = 0; - if (!esw->qos.enabled || !MLX5_CAP_GEN(dev, qos) || - !MLX5_CAP_QOS(dev, esw_scheduling)) + if (!esw->qos.enabled) return 0; if (vport->qos.enabled)