From nobody Mon Apr 6 09:19:59 2026 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 6128FC04A95 for ; Sat, 24 Sep 2022 02:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233379AbiIXCeU (ORCPT ); Fri, 23 Sep 2022 22:34:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233282AbiIXCdd (ORCPT ); Fri, 23 Sep 2022 22:33:33 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 661E8151B03; Fri, 23 Sep 2022 19:33:20 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdJ0XjBz1P6tw; Sat, 24 Sep 2022 10:29:08 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:18 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 10:33:17 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 14/14] net: hns3: modify macro hnae3_dev_pause_supported Date: Sat, 24 Sep 2022 10:30:24 +0800 Message-ID: <20220924023024.14219-15-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220924023024.14219-1-huangguangbin2@huawei.com> References: <20220924023024.14219-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Redefine macro hnae3_dev_pause_supported(hdev) to hnae3_ae_dev_pause_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethe= rnet/hisilicon/hns3/hnae3.h index 94b71701a74d..1bd695e88cca 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -143,8 +143,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_stash_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_STASH_B, (ae_dev)->caps) =20 -#define hnae3_dev_pause_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_pause_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, (ae_dev)->caps) =20 #define hnae3_ae_dev_tqp_txrx_indep_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, (ae_dev)->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index e4278ec95d21..58f19006e403 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -701,7 +701,7 @@ static void hns3_get_pauseparam(struct net_device *netd= ev, struct hnae3_handle *h =3D hns3_get_handle(netdev); struct hnae3_ae_dev *ae_dev =3D pci_get_drvdata(h->pdev); =20 - if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps)) + if (!hnae3_ae_dev_pause_supported(ae_dev)) return; =20 if (h->ae_algo->ops->get_pauseparam) @@ -715,7 +715,7 @@ static int hns3_set_pauseparam(struct net_device *netde= v, struct hnae3_handle *h =3D hns3_get_handle(netdev); struct hnae3_ae_dev *ae_dev =3D pci_get_drvdata(h->pdev); =20 - if (!test_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps)) + if (!hnae3_ae_dev_pause_supported(ae_dev)) return -EOPNOTSUPP; =20 netif_dbg(h, drv, netdev, diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv= ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index cc3ba2a16f5e..e8e18bac5b50 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -1182,7 +1182,7 @@ static void hclge_parse_fiber_link_mode(struct hclge_= dev *hdev, if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 - if (hnae3_dev_pause_supported(hdev)) + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported); =20 linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac->supported); @@ -1198,7 +1198,7 @@ static void hclge_parse_backplane_link_mode(struct hc= lge_dev *hdev, if (hnae3_ae_dev_fec_supported(hdev->ae_dev)) hclge_convert_setting_fec(mac); =20 - if (hnae3_dev_pause_supported(hdev)) + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported); =20 linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac->supported); @@ -1230,7 +1230,7 @@ static void hclge_parse_copper_link_mode(struct hclge= _dev *hdev, linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, supported); } =20 - if (hnae3_dev_pause_supported(hdev)) { + if (hnae3_ae_dev_pause_supported(hdev->ae_dev)) { linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported); linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported); } --=20 2.33.0