Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132701/?format=api
{ "id": 132701, "url": "http://patchwork.dpdk.org/api/patches/132701/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-12-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231017054545.1692509-12-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-12-chaoyong.he@corigine.com", "date": "2023-10-17T05:45:31", "name": "[11/25] net/nfp: extract the MAC address data field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ef9edd3b68a0c14642a0986f954b185bf1ca4b2c", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-12-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29865, "url": "http://patchwork.dpdk.org/api/series/29865/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29865", "date": "2023-10-17T05:45:20", "name": "add the NFP vDPA PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29865/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132701/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132701/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 2B9D243186;\n\tTue, 17 Oct 2023 07:47:43 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C36FB427E1;\n\tTue, 17 Oct 2023 07:46:41 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2095.outbound.protection.outlook.com [40.107.244.95])\n by mails.dpdk.org (Postfix) with ESMTP id A946440DFD\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:46:39 +0200 (CEST)", "from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16)\n by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct\n 2023 05:46:37 +0000", "from PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023\n 05:46:37 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=GjuqZeqDl0y0Jb0dmo3hI8bRFzYSba0TnYeRDHn3NkMznnrto/NVpBvfz7ESxmsAarheWKkbhmmVizk4VSrcjlj1Px9n85v2xAPwlqW/SLxNYHNztTb86x9Eso8vVcAeOW20kVpNJ/BCBC13VD59eU7H0z9Ka02e+AHS87+CgYCbCKk93UHkcCrRLZgxn3y3qn/wqs9+QvWhab/k+XLNUwnNmZr8AZoW7momQb1H+m46hqxHRxdpbP9eyL1n6vdiFyv5CkJyPLOC9LmZMfwejULKPlojwOnZLzy6FETsxscxynKnwN2i8qJbT/t6Wu510Op6fJdBzyr3je6ZLPiOXA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=3eGbDPhqLLIKbz2eLGD1WCZsDHcX8F9pMDKetA7y6Yg=;\n b=FDQI7pBrTl82l2wSc29dmXmIfKGUu9O9rdim9qVsi9jXOZTvCKdj1+QiLthUomyW9KQMgYG+KATlfkTTr7lcb9e7kuxRBeLOhbA0s2T2OHzjVDQAbNjz3qFhNFvNSx8jEPCiA0Odw07ziGLzK6Qjc0Luk0wLgzZh/7GfF7v+dWsHzZkKUtD8OIj1ZyrJktC8VOoKT8Dv2qgPRVAF7sJeEEIejlC/ux/eeWooMRd2k8moU5+rDx5JQYwBE/v/N8YyULf2Usxmm5EUQ84VFQ9KAPzqbOEIDGvESc7nUBmY8liKF1WdwfyDaGkCoqdWRqlAcb+RGqCva4O5GbaMNwthyQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=3eGbDPhqLLIKbz2eLGD1WCZsDHcX8F9pMDKetA7y6Yg=;\n b=px6Lg//qCELxLuCb8wRDDcZaOXlFRrIJZmeLlJAFilyuc//2tFEh9gFNbLfLKa/By6fRxpmumPslKM8KIMPlospk6FVHuwlQ7fW2wc0bJjY+o/9WdEuMXUAKkQd9zbJZ8Xwwjt9MgNLfGDQm6EhjomUF49IYOkoCDo1jwQkZR3g=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH 11/25] net/nfp: extract the MAC address data field", "Date": "Tue, 17 Oct 2023 13:45:31 +0800", "Message-Id": "<20231017054545.1692509-12-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "References": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "PH7PR17CA0069.namprd17.prod.outlook.com\n (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com\n (2603:10b6:510:12b::16)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "PH0PR13MB5568:EE_|MW5PR13MB5904:EE_", "X-MS-Office365-Filtering-Correlation-Id": "4ed0d223-fbbf-49c4-0ed4-08dbced46d54", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n KvpSuyLAaCn0WzOHeUXxmxNHLkFi58qmVccPy6M5Xv7IUgsNeOaRLM2m5QAqq+Mr+LrtCIBmXXcaWv9iAzsiaimPaz+KNNhKhl/gBKMKIyRZhMifDCSe5b3eLRHsZygpdBavuYjQi5fqE8BpdNxMpTar6pWGIinqsB20D/KT1Qopz3uEuElTOc70/bhhb3QjM8/TcfMAdWyZtSLeSnN6csGerBArVtw3Z++1Wy0tA7QEg4FqYSGKOFNY/vEywxWYfgZqSSuyE1eQcweTAZdJK6BnAd4vp+jsML3fno5QPzBBBwx5t2xznxQp1pofyWw5joBcm9yMa6fUMDTO+TYziVCb9x3I+32pkjSGeNTiIWSv97GPOrhiMIL9nZgSKGwNWSAiKhcP/APGYXQn1qlrkQZTbdxriGmf3WgGTAHDhCaf96tdqzS6iUL79tWbIf4hI+0YYX9prj4pcvWHLLiSVj7Kg5U7cweAugQzrgLQNd3JBS1JLD7kVwXSUFSu3Pi1MlEGSxSKDRsHLKMfylFbwdw/VSjIBuXcysQ+0UwOCRVb4Ln38FRvPhXNyXOuWBhLtDko2vqh6c5q9NuteciQQGnuBwKxtm7bvLGnsgfkp6VuxUHLUpBRTd3H+FFmS2SU6dWqG88zrRBNQ3CkWOCB6EqxD4YbzYqpPigQNlDV4qI=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6666004)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n /ty5huAFAq5iRngRSf17cCt9rSQCinW/wjQenhWuMS1WaDydOnVcYs4DPSF9IQFLb4N5KJ0yPXrj6a8pazISUv/U2SOcMyEKMszhV5Lk9D8NScUoge0LbjsKHTWgD3h6hIpk2RfI6EwadFhhGnJrYNEuDNDVyRPj3JQErFv8hFwdydM4ux0QOs4ogAaHegZV+rIYUjp+c7uUNut9MyxMPd9EmBtRXkzPqWSY64eDPW09JB7N/sRZZ9UFZM7jUUCyH5z35Bjev8PkXbX57foidkEIpHtSspshEmZedLqT6DTeWzsPtCYPKc3XQCmR21cswCYosZavRJ7QZpnySQENER1wsr1HZV/PnY3lFFcBT2rEMUW85e209rMX7W0MoY6eZECRImTzJZUJKqI8Q983ruGdeMkLz3Z0wcdCZlJRwn60ptjCjjmxyR4fpV0cxEwIwYoNNsUyFMNGJwDBXEXlPuaFsgIfsjBgdvPyrHIfJsNnqlGI3t7Y8o4AApyCFOW6hGzOkEHyFd/mh7S/S6ZrKfFVEOIhlQwoJuxYumWHAKXoK2TAIu/St60OJtkan0WQCEt4YNMGCUFslQOGU82kTWbEmzCriLHFykqVbqfMYwm2BMWZcn6j8kh+7B9CTg/DD+WWRmgL/BE5il6o4Zx+tdWMgL+mz0bMavaMHvBcEq+SItl1AiPd1ISLj0fpT8h/xJN1P6kWvc/P3maP9TlgvcPeQgxU6J56Sv5mhuJoTbXLtCKIPLR44Crqsalkco4KC5ym07dHxFjXx2lW9uBAcyiftyXBWJILjnZF16qYMwb734c8rYgq5b+4e6RcTpZz03aeIXnE9n5FRVUMxsbsxFD8hLJYlbTviFZhTjS6mKa22PqCF/p74HtD9BSbc8s1AMFDZs4H2qsD9G4CorG7eyNV1wOx7UFJ8G7+z4owdRZpShx6VS2U+OaNbyr78wy5FFw/gDjuJP5sD75vQCOGvlELvL2lFlJv2E2D8OhE9NLv3bvClDQDPBHVl3fi1pzxKZ9UmhDnraj2PNQnG15k+mxRy2NQWKGTGuR8ZBFnAOTgW77R7FUG7gnKDmI+QKBp1hFUx7f6Y/yzkNbWqTFZqFZREw/yc+Rhz49/WEjjN08BGR/0IQdXtnnNeQgF51zwldxkDf7Gc8zdj9hq5rJSQRHKc6hjOx9GpDY6h3IEbYYx3Zg7ruraKuwYyYMizMVCv80zBOv3ny9fqAc//QMys5lc89hwy5DOXQQhhfo4dCQTzp7ADllV6SPOMi6aU73BEjdckBLiiOKO4jN6i8+iseGu2I5SFwRwW/B22MrG6IyOr5dyvqDrwSvdZQ8ECEsbCaNCfW9uKGFbR6Xc4eHtGMw8Qrg7w2R3aH8AQoJSBkcm81RVP8XOsGMLcSW0N2Qe9tnyc5jVCpg6dMUouWkyC6P0GBG9xPVhsAZ/pdOwDOC7Efm3vweJi33o6nCQUWETtjTfRBficN3JM3ErhVtFPjy/QZvX1H5/DSwV6sAAViVXeUiF7IRYg2zztlp89l7vpjwyvYIBAtEf5oZXmYFR6qf77Us54iUkG+3sz6rUplDT7IEV3Rg6bmZk1rl1louqaNvHBaI51+QcrYtg/ZnadQ==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4ed0d223-fbbf-49c4-0ed4-08dbced46d54", "X-MS-Exchange-CrossTenant-AuthSource": "PH0PR13MB5568.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "17 Oct 2023 05:46:37.5648 (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": "\n PLtawgrVzEVDEJteQDXpiSXTfHmw2spx4xpfvRMNaU2pONz75yaxCh2W6lUV62LvA9nN0jJ2hWxZGCxvmDfCUSh5swur3J2OudiFSOX1byU=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW5PR13MB5904", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Extract the 'mac_addr' data filed into the super class, prepare for the\nupcoming common library.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/nfp_ethdev.c | 14 +++++++-------\n drivers/net/nfp/nfp_ethdev_vf.c | 18 +++++++++---------\n drivers/net/nfp/nfp_net_common.c | 8 ++++----\n drivers/net/nfp/nfp_net_common.h | 5 ++---\n 4 files changed, 22 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 2f8df1c936..afa3a37763 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -33,7 +33,7 @@ nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic,\n \n \tnfp_eth_table = nfp_eth_read_ports(app_fw_nic->pf_dev->cpp);\n \n-\trte_ether_addr_copy(&nfp_eth_table->ports[port].mac_addr, &hw->mac_addr);\n+\trte_ether_addr_copy(&nfp_eth_table->ports[port].mac_addr, &hw->super.mac_addr);\n \n \tfree(nfp_eth_table);\n \n@@ -598,18 +598,18 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t}\n \n \tnfp_net_pf_read_mac(app_fw_nic, port);\n-\tnfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]);\n+\tnfp_net_write_mac(&hw->super, &hw->super.mac_addr.addr_bytes[0]);\n \n-\ttmp_ether_addr = &hw->mac_addr;\n+\ttmp_ether_addr = &hw->super.mac_addr;\n \tif (rte_is_valid_assigned_ether_addr(tmp_ether_addr) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %d\", port);\n \t\t/* Using random mac addresses for VFs */\n-\t\trte_eth_random_addr(&hw->mac_addr.addr_bytes[0]);\n-\t\tnfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]);\n+\t\trte_eth_random_addr(&hw->super.mac_addr.addr_bytes[0]);\n+\t\tnfp_net_write_mac(&hw->super, &hw->super.mac_addr.addr_bytes[0]);\n \t}\n \n \t/* Copying mac address to DPDK eth_dev struct */\n-\trte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);\n+\trte_ether_addr_copy(&hw->super.mac_addr, eth_dev->data->mac_addrs);\n \n \tif ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n \t\teth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;\n@@ -620,7 +620,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t\t\t\"mac=\" RTE_ETHER_ADDR_PRT_FMT,\n \t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t\tpci_dev->id.device_id,\n-\t\t\tRTE_ETHER_ADDR_BYTES(&hw->mac_addr));\n+\t\t\tRTE_ETHER_ADDR_BYTES(&hw->super.mac_addr));\n \n \t/* Registering LSC interrupt handler */\n \trte_intr_callback_register(pci_dev->intr_handle,\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 6ead7e02b8..dead6ca5ab 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -16,14 +16,14 @@\n #include \"nfp_net_common.h\"\n \n static void\n-nfp_netvf_read_mac(struct nfp_net_hw *hw)\n+nfp_netvf_read_mac(struct nfp_hw *hw)\n {\n \tuint32_t tmp;\n \n-\ttmp = rte_be_to_cpu_32(nn_cfg_readl(&hw->super, NFP_NET_CFG_MACADDR));\n+\ttmp = rte_be_to_cpu_32(nn_cfg_readl(hw, NFP_NET_CFG_MACADDR));\n \tmemcpy(&hw->mac_addr.addr_bytes[0], &tmp, 4);\n \n-\ttmp = rte_be_to_cpu_32(nn_cfg_readl(&hw->super, NFP_NET_CFG_MACADDR + 4));\n+\ttmp = rte_be_to_cpu_32(nn_cfg_readl(hw, NFP_NET_CFG_MACADDR + 4));\n \tmemcpy(&hw->mac_addr.addr_bytes[4], &tmp, 2);\n }\n \n@@ -332,16 +332,16 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \t\tgoto dev_err_ctrl_map;\n \t}\n \n-\tnfp_netvf_read_mac(hw);\n-\tif (rte_is_valid_assigned_ether_addr(&hw->mac_addr) == 0) {\n+\tnfp_netvf_read_mac(&hw->super);\n+\tif (rte_is_valid_assigned_ether_addr(&hw->super.mac_addr) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %hu\", port);\n \t\t/* Using random mac addresses for VFs */\n-\t\trte_eth_random_addr(&hw->mac_addr.addr_bytes[0]);\n-\t\tnfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]);\n+\t\trte_eth_random_addr(&hw->super.mac_addr.addr_bytes[0]);\n+\t\tnfp_net_write_mac(&hw->super, &hw->super.mac_addr.addr_bytes[0]);\n \t}\n \n \t/* Copying mac address to DPDK eth_dev struct */\n-\trte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);\n+\trte_ether_addr_copy(&hw->super.mac_addr, eth_dev->data->mac_addrs);\n \n \tif ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n \t\teth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;\n@@ -352,7 +352,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \t\t\t\"mac=\" RTE_ETHER_ADDR_PRT_FMT,\n \t\t\tport, pci_dev->id.vendor_id,\n \t\t\tpci_dev->id.device_id,\n-\t\t\tRTE_ETHER_ADDR_BYTES(&hw->mac_addr));\n+\t\t\tRTE_ETHER_ADDR_BYTES(&hw->super.mac_addr));\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\t/* Registering LSC interrupt handler */\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 94d9072740..cd199b1d4e 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -532,19 +532,19 @@ nfp_net_cfg_queue_setup(struct nfp_net_hw *hw)\n }\n \n void\n-nfp_net_write_mac(struct nfp_net_hw *hw,\n+nfp_net_write_mac(struct nfp_hw *hw,\n \t\tuint8_t *mac)\n {\n \tuint32_t mac0;\n \tuint16_t mac1;\n \n \tmac0 = *(uint32_t *)mac;\n-\tnn_writel(rte_cpu_to_be_32(mac0), hw->super.ctrl_bar + NFP_NET_CFG_MACADDR);\n+\tnn_writel(rte_cpu_to_be_32(mac0), hw->ctrl_bar + NFP_NET_CFG_MACADDR);\n \n \tmac += 4;\n \tmac1 = *(uint16_t *)mac;\n \tnn_writew(rte_cpu_to_be_16(mac1),\n-\t\t\thw->super.ctrl_bar + NFP_NET_CFG_MACADDR + 6);\n+\t\t\thw->ctrl_bar + NFP_NET_CFG_MACADDR + 6);\n }\n \n int\n@@ -565,7 +565,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \t}\n \n \t/* Writing new MAC to the specific port BAR address */\n-\tnfp_net_write_mac(net_hw, (uint8_t *)mac_addr);\n+\tnfp_net_write_mac(hw, (uint8_t *)mac_addr);\n \n \tupdate = NFP_NET_CFG_UPDATE_MACADDR;\n \tctrl = hw->ctrl;\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 02ec854498..02a5ffefd8 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -118,6 +118,7 @@ struct nfp_hw {\n \tuint32_t cap;\n \tuint32_t ctrl; /**< Current values for control */\n \trte_spinlock_t reconfig_lock;\n+\tstruct rte_ether_addr mac_addr;\n };\n \n struct nfp_net_hw {\n@@ -158,8 +159,6 @@ struct nfp_net_hw {\n \tuint16_t subsystem_device_id;\n \tuint16_t subsystem_vendor_id;\n \n-\tstruct rte_ether_addr mac_addr;\n-\n \t/** Records starting point for counters */\n \tstruct rte_eth_stats eth_stats_base;\n \tstruct rte_eth_xstat *eth_xstats_base;\n@@ -375,7 +374,7 @@ void nfp_net_log_device_information(const struct nfp_net_hw *hw);\n void nfp_net_enable_queues(struct rte_eth_dev *dev);\n void nfp_net_disable_queues(struct rte_eth_dev *dev);\n void nfp_net_params_setup(struct nfp_net_hw *hw);\n-void nfp_net_write_mac(struct nfp_net_hw *hw, uint8_t *mac);\n+void nfp_net_write_mac(struct nfp_hw *hw, uint8_t *mac);\n int nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr);\n int nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\tstruct rte_intr_handle *intr_handle);\n", "prefixes": [ "11/25" ] }