From patchwork Sat Sep 24 02:30:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangbin Huang X-Patchwork-Id: 12987335 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25AA9C6FA90 for ; Sat, 24 Sep 2022 02:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233227AbiIXCdT (ORCPT ); Fri, 23 Sep 2022 22:33:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233209AbiIXCdS (ORCPT ); Fri, 23 Sep 2022 22:33:18 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24D0E1514FD; Fri, 23 Sep 2022 19:33:17 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MZCdF1QjPz1P6mk; Sat, 24 Sep 2022 10:29:05 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) 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:12 +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:12 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 02/14] net: hns3: modify macro hnae3_dev_udp_gso_supported Date: Sat, 24 Sep 2022 10:30:12 +0800 Message-ID: <20220924023024.14219-3-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 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: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Redefine macro hnae3_dev_udp_gso_supported(hdev) to hnae3_ae_dev_udp_gso_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_enet.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index 21308c5e280b..3bc3fc528ed9 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -110,8 +110,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_fec_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_FEC_B, (ae_dev)->caps) -#define hnae3_dev_udp_gso_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_udp_gso_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, (ae_dev)->caps) #define hnae3_dev_qb_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_QB_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 39b75b68474c..9e4935a90c8b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3320,7 +3320,7 @@ static void hns3_set_default_feature(struct net_device *netdev) if (hnae3_ae_dev_fd_supported(ae_dev)) netdev->features |= NETIF_F_NTUPLE; - if (test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps)) + if (hnae3_ae_dev_udp_gso_supported(ae_dev)) netdev->features |= NETIF_F_GSO_UDP_L4; if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps))