From patchwork Thu Jun 23 02:26:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jin Liu X-Patchwork-Id: 113285 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 87D78A0545; Thu, 23 Jun 2022 04:27:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44FC042847; Thu, 23 Jun 2022 04:27:07 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2112.outbound.protection.outlook.com [40.107.94.112]) by mails.dpdk.org (Postfix) with ESMTP id 5383342820 for ; Thu, 23 Jun 2022 04:27:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITmGpvldcbiMP9L8jZnDqJBbiJLXiHQwYUsUQFPSjIi1A3Cg8UChe+BDfRJBLSmpZJPeTehDqs8Lvbal9u8NA6qS9PbyubBF9JljeiQuIxa7ovig3IEtOl3mdjUIgjY67LouQ97ZWQOAQlckKQo05kySER8trp1ZAnpJaLC0Q3tjiuATV1l5lEfcddd/BdilNujtnB+ds8VNJ2ZR3N845Y8RfRwFX/6UKFBQ0CfORaaaCurPPgWBxNrQwVNjXyVA3sDe2GH5mbRFWdWvsDS0Cce2UA9ZOVWtXQKFuXJvMR2m2LMIKgubODjFhBuK0y+Zbx9V8oDrC+Uvp28IdOo/mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RU9gmDKOVRrLslsiwEu0anotCV1KAc8Bfwn9RI+f7wc=; b=NEQMvQce3+Ps1i57inxDOJ9AMkKLK1cwBhnY8EVJgKUCBzIFMKrNjgUAS7YYrOQZ+eek9lN3CcRuS2M4vqT6SdbzE5qsPCCo3xMdhF0POzQKhLeCaXmMe/wq4OGV0ZnQpADvqrpaQOissYxbQmcIq+lFn0x9sNYTDMey8DOaQg5p/gjbNb9zv6x1UwJsbBUPs6Fjzi7z9f8byWLU1HiGcnbrHLvgvcTmH3thAuvXQoU2aibdt3vOfoZtiafRjsfBRaSbLkIUME8u/ROa4+2WORzxgsW8cuhv0M78xM4sfGQDh7nz0V5bziw++wfugdkXwm0colW/60e+BHnZpInQUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RU9gmDKOVRrLslsiwEu0anotCV1KAc8Bfwn9RI+f7wc=; b=D1ZwaykNbYVYnjf9trOXIDdlr/AtncPo/mJKIo1L+KZFSC4ZXv6LhBW+EPI29rd30YRqF5Q6i5iO7rbnu8yTfQN78voGAsQa3HI/k+Pc/Y+U6kFZXFS8RucdbRd9zEY+nQ1evNdMASebo7Rb1bTQvsf8wPYuvU1rRxqEX3UGQ6U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21) by MN2PR13MB3535.namprd13.prod.outlook.com (2603:10b6:208:169::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Thu, 23 Jun 2022 02:27:02 +0000 Received: from DM6PR13MB3004.namprd13.prod.outlook.com ([fe80::ac31:a36a:cc15:cd35]) by DM6PR13MB3004.namprd13.prod.outlook.com ([fe80::ac31:a36a:cc15:cd35%7]) with mapi id 15.20.5373.015; Thu, 23 Jun 2022 02:27:01 +0000 From: Jin Liu To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Jin Liu , Diana Wang , Peng Zhang , Chaoyong He Subject: [PATCH v4 04/13] net/nfp: rename set MAC function Date: Thu, 23 Jun 2022 04:26:06 +0200 Message-Id: <20220623022615.3628093-5-jin.liu@corigine.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220623022615.3628093-1-jin.liu@corigine.com> References: <20220617093444.2004000-1-jin.liu@corigine.com> <20220623022615.3628093-1-jin.liu@corigine.com> X-ClientProxiedBy: LO4P265CA0222.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:33a::10) To DM6PR13MB3004.namprd13.prod.outlook.com (2603:10b6:5:191::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7816f9a7-f8e8-46a3-85e3-08da54bfdafd X-MS-TrafficTypeDiagnostic: MN2PR13MB3535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b14Cq8V214BzGv1it6LOgLVEnDpV3yWHK5NzP6eyeWmj7Gd/FQma71fXeJ7T9mHNk+AG2LBSniGYSY+ZWhRX1uTCzbkIEyItui9dJY2bh41Sty681McZyK/DJ+77ARMlNgELYq0u0GIrfz2SYRxUiOdd/8qtjKPUslN9NPZ72chKT/oGpNAm6UGsULwkrslCrX22KRYwgGhbxfy3vWjlBBi2hRLIdzrlUIWa7c1AlZTMTr7p0k8KfGzcrclCJ3wLWtTUiuc2z9gLFKJ1V+xAx07x8yoQVQ6J2WcIMKzdV3AK/zif2awBq5UhZJFCvX7FUeb7UQwx8EEpE0PDAhFgX8khfLw+ulUylIUL58z7dLox3Mj7qXRe2tNFjkQULNHt4i5iYCGDbEf3Apzl9mUQ8Li2q/OfnpHfOyDqBsGc1tF/WQtXuiS0lQqgsuZpcfl0EuhkA8FcbOyiEQYfPP6sWEt0Qp/VOOaZrsuLidnWmXHx9m9h87lKjGRmPpXYXR1aibqHGbtmLZvu3/PG52VVFjw1tWPnmBTtYbUMHoO3TDhmCYa6SFFo6RdiV7Ue98yLlg0ffiOkhR1/Q+AeRZJFdOiS0ZFCYoex/iv7BFcdGNuCcIf6kcjh5eUcldzp3CvP93DG8Cp0v4rE44P/APTfqYqbe6leRlwqFbW4rIxDYaTOc78Cc+1ZoF9Vp/QyLlgT7OdKptqCgtzOkQjuGRFr7iMZDUGx0m25323dhYPUl/kqB+Nm7meuv6/tvJXQar2+eodb0iElqDWY1/T2gedkuZifT5fK52aXtKlwxyLZJVDM5oyNh8eGg+NQaYVAujvy X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR13MB3004.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(366004)(346002)(136003)(396003)(39830400003)(107886003)(1076003)(38100700002)(38350700002)(6486002)(36756003)(66574015)(8936002)(54906003)(2616005)(6916009)(5660300002)(316002)(66556008)(52116002)(6506007)(186003)(66946007)(8676002)(4326008)(66476007)(41300700001)(86362001)(6512007)(26005)(83380400001)(478600001)(2906002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?mxIda5Gy1aJs/WBtD8vVLoo3ZZBU?= =?utf-8?q?AAk3YT8qeDKgIBaqBan10xrl/Ttwh6UrMMGPR+j/TbMPdyNjB/pKabCUiG2eGgDA0?= =?utf-8?q?giRcT0z0PLCahGP3EDMZlq1QYh+/pZwrr2p7M4/jLTm+ekOSrDKxbxxuJTDjZRNL8?= =?utf-8?q?Tx5qPKtExuivP09IjIlnjPWyHJYrOokiiTLuhxRnzXQuFQ3biOjLSbJDE5mySBZ8G?= =?utf-8?q?XWsE2/bZSi9ootI3APR7qHObpGZ05NxtfMCmY+ZqhYQqOa2VQ7UWBVZIyFL2YaCnl?= =?utf-8?q?5KX2GCgx6YFEFbBPjlVcuLIQFi556T3v2EktZ6nUNrDPcRUK9LAykCNW/X5qivpd5?= =?utf-8?q?+go8V+cOuJfFjRXxnyvYyKETgSIeB6b6UX3VMdDUuRNHT0QTzSrdEz0AW0vxcl6qf?= =?utf-8?q?7vrllCbVslcprZtnXY2cOppma+Fy8nxYGQgLlNYaNyBb1AQ9QH5HdJ0vlf88ihSXQ?= =?utf-8?q?tNBFLXWdVepY0BhRN8MlXw4W46orOfoKhMIfMaUCK/fRGF1XwMCAImZKldOUDxcze?= =?utf-8?q?ilgVCp703vSaBeZGzkG2pEf4d0je+8MaNS/esWVYYkR/wiNhItq3WV+ET0LBn7WEJ?= =?utf-8?q?OGMt4lmg9PVGpl9e2KE/XBnOGIZTDTL4CHZ19AajNF0vxMq40ylY1yWQ5QLSZhXYJ?= =?utf-8?q?oRCy11aICnvOPXopBSLRd8QtofxWQ/T9DcNbjB/27sKOWTAJmFrBUcKmPqeUhOxSu?= =?utf-8?q?2rhmDVRfh7fE9/1w2ywe0kJFzHzoorct/hfTnGkfMzhJUqorN9a/kKtHQS33gJ5iD?= =?utf-8?q?ngN5drAjgrivSlXCzQiLo0V1rNQpFq8/M3WWzzI5p+ED5iqoiRwnGuZhwobpU3oBC?= =?utf-8?q?E3yXkh2fAOtmw3KHYSuKhADzM/nuL0gTALV/G8uuMaBIbg/GTPedO/bg9ds9c4Spp?= =?utf-8?q?D5frQK87ao6eXBGmDwfVxyesrGqbHIIIAIaMu+nm7CQC51n01etX3i8gtM1TUy1Yp?= =?utf-8?q?fiCFwXZNyrqcHnZnp7ci2F46z9VBEvS6LfPBPMMKkGvwjp7MhdrQd8pSCDtUfdPM0?= =?utf-8?q?xTAUteSy9PsetKWRgySm5VHfAUGRf68fO0/gSv77CbA+KDO93/kKbLIZdiYfOshCa?= =?utf-8?q?nRfuXc/fFsJ0zSkiSc6DaClAdM9b9o9k+ai8AJo1P4zZ+7LbUBbSBuGuVSdyhGGz4?= =?utf-8?q?WWdNi9e5ChrRMe5j5ynrJ7+XaLQcTXyuLpYNElXFuMfF6zOiUsOhlt36DgFZM5ZMS?= =?utf-8?q?FLXe390W8KliDuuGHtgJO9Z6T2obHj50/o5klo5kECiiNE2HUb7phxWiGmvbltm0Y?= =?utf-8?q?4bw57vxm18sDcVf4H4vvM+Md9ErkElvJxsbix8B3kOsiRgQGymzv9MmAmymo+8ENN?= =?utf-8?q?WxlJR/sdjXfkqk2BJeV70977C3AEroXWMiCRMFyht88NjuuyEcFIpQ8Be0sSZHa7Z?= =?utf-8?q?dvWIw9ofyFNye+yCUy++QI+EkPxi6WPZa2ZFJrfcKvNjTwxuBwxWK6JmlEhrBbZ7M?= =?utf-8?q?Wkj2Fb6gEQhVEN3k8I9ffjBB0l2A4VDlWxcFbn14zVaZ3X2Q8/Z5L6dRKWsbOSskE?= =?utf-8?q?88qOJJUUD7l+?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7816f9a7-f8e8-46a3-85e3-08da54bfdafd X-MS-Exchange-CrossTenant-AuthSource: DM6PR13MB3004.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 02:27:01.8537 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CKYKnSdwxB/R+DlCkYCC0DZgP1Ym2zRYf3PKYo3WnlNc9Basle+p5F2AO/YhmF/a6YJ/YSs7/idNyJtki5Is0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3535 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The NFP eth driver function name start with 'nfp_net', but set_mac function start with 'nfp' only, rename it, be consistent with others. Signed-off-by: Jin Liu Signed-off-by: Diana Wang Signed-off-by: Peng Zhang Signed-off-by: Chaoyong He Signed-off-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 2 +- drivers/net/nfp/nfp_common.h | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev_vf.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 34e3a03edd..9903a1bd5a 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -274,7 +274,7 @@ nfp_net_write_mac(struct nfp_net_hw *hw, uint8_t *mac) } int -nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { struct nfp_net_hw *hw; uint32_t update, ctrl; diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 49d6bb6ad5..8e1b4fb6a4 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -350,7 +350,7 @@ void nfp_net_disable_queues(struct rte_eth_dev *dev); void nfp_net_params_setup(struct nfp_net_hw *hw); void nfp_eth_copy_mac(uint8_t *dst, const uint8_t *src); void nfp_net_write_mac(struct nfp_net_hw *hw, uint8_t *mac); -int nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr); +int nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr); int nfp_configure_rx_interrupt(struct rte_eth_dev *dev, struct rte_intr_handle *intr_handle); uint32_t nfp_check_offloads(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 36ab31b688..b80109ec37 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -344,7 +344,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = { .dev_infos_get = nfp_net_infos_get, .dev_supported_ptypes_get = nfp_net_supported_ptypes_get, .mtu_set = nfp_net_dev_mtu_set, - .mac_addr_set = nfp_set_mac_addr, + .mac_addr_set = nfp_net_set_mac_addr, .vlan_offload_set = nfp_net_vlan_offload_set, .reta_update = nfp_net_reta_update, .reta_query = nfp_net_reta_query, diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 8d68ccbc95..08077632c6 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -251,7 +251,7 @@ static const struct eth_dev_ops nfp_netvf_eth_dev_ops = { .dev_infos_get = nfp_net_infos_get, .dev_supported_ptypes_get = nfp_net_supported_ptypes_get, .mtu_set = nfp_net_dev_mtu_set, - .mac_addr_set = nfp_set_mac_addr, + .mac_addr_set = nfp_net_set_mac_addr, .vlan_offload_set = nfp_net_vlan_offload_set, .reta_update = nfp_net_reta_update, .reta_query = nfp_net_reta_query,