Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133560/?format=api
{ "id": 133560, "url": "http://patches.dpdk.org/api/patches/133560/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231028065315.1937188-6-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.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": "<20231028065315.1937188-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231028065315.1937188-6-chaoyong.he@corigine.com", "date": "2023-10-28T06:53:09", "name": "[v2,05/11] net/nfp: remove the redundancy macro", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "36464c2ecfe1e9c75e7616411be60176155a016c", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231028065315.1937188-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 30041, "url": "http://patches.dpdk.org/api/series/30041/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30041", "date": "2023-10-28T06:53:04", "name": "Clean up NFP PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/30041/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133560/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133560/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 4A84243220;\n\tSat, 28 Oct 2023 08:54:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 069A140A6C;\n\tSat, 28 Oct 2023 08:53:57 +0200 (CEST)", "from NAM04-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam04on2111.outbound.protection.outlook.com [40.107.101.111])\n by mails.dpdk.org (Postfix) with ESMTP id 151E140A80\n for <dev@dpdk.org>; Sat, 28 Oct 2023 08:53:54 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct\n 2023 06:53:52 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Sat, 28 Oct 2023\n 06:53:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Vwg/yQ4CgVyW8ufzrOAFmi9D2OSRW6+tSZifrSVGuoHCsSDYPLMORiwZjp2Lpj99D72S7YzVLp3fD7ooC9WlTAKku68eeAMjoDESk56vwUQ6vF+sih8eGdUhJ5bpHus+gQmhn278FbYY+j2ewbvBKmL2zjRQjCHQuWMLxkYZZeKEdRxf6F2wm0uOodNKrKBUzReOfgOV0tbQh7p+XIQ0shkooKkEFI+Gb7Ds6HT5JRafIz0CoFJMvLcvVU27HlmNqJm0Imnlha7DRLQ3wmUA/TRl4wUHU/5NnWEpBAvx2KCanQcOcKVQqYjkft4b8ZVs+SJaKvhC151OKvzrfCMiog==", "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=KJpjF7bfYGXtbib0Z+5st78XzovLgPHBjHhvlpPssak=;\n b=C0eR0OQn8ZORpVKKgU9nafX0R9hqHDPCMI0E0bU4Rn70Jf1uUD23MV5XkNhwCkO29OdAJv3oFmsk1VVfwzEeIvwWsgZo6P0v4jjI7m1/6L8gac30dhZg17jUs+V+dTquqWIXMg72OO9f1MZyBIyv/Myr5zr/AlQj/KYmBOyHhnoQ9isUnddzvu2x/WgWu61zee6MNOQLE1OHHOc8fr+MNUmCvRd3QYxjQB3i9cbjx+PTFrgI7lAK9CZ+gkL5sREVj87bdHvYzynNLAmAXxKQRGG80C7Idsewr2mdRxYe4CpfX11JYMIXJ8VNnum/aq+DCzZALxhiXeC1YRm8bp29Fg==", "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=KJpjF7bfYGXtbib0Z+5st78XzovLgPHBjHhvlpPssak=;\n b=D2AaeM+lE6IUE+yfck0hhOH2LhIzst1N9RyZdcXyz5CQaQIbnYFVcDZCpBzu6rEQXTmj5YxrkMkEp/QEiIMIKTc0K1GyuTBn6agI6wmSrOjiyAU/vXRCDYW7A3oRBNUioqeRrxJsWPT/gSjSjdHzhwv+MBQje+w37fhp+3CegzM=", "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 Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH v2 05/11] net/nfp: remove the redundancy macro", "Date": "Sat, 28 Oct 2023 14:53:09 +0800", "Message-Id": "<20231028065315.1937188-6-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231028065315.1937188-1-chaoyong.he@corigine.com>", "References": "<20231028061558.1842855-1-chaoyong.he@corigine.com>\n <20231028065315.1937188-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SA0PR11CA0020.namprd11.prod.outlook.com\n (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_", "X-MS-Office365-Filtering-Correlation-Id": "2217b066-3636-4955-242e-08dbd782a535", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n SDIslHMF9SXvAEgN3Gsh0A7xG2xArq1aWvYLb0q8A2CxqcbvYS3822WqTY/hqXNK8skwzSXHNHqPBH1M3Bey3coLW1vsiq2tsQo5VCVwlqHMNsaTNfujQ22SeY9ZN7hGcUTD43CmB1s82m6bKqIxPityKNUQhwlhUNPB0GiLaV5f85Ot0ASZ9YFEvzOI/vEgi2kbP8A6cdz5HCGiOzULXEZyItIoJIeey5U9q5dLuv+hidxN5UJl833MA5pk1LD5r670FwOKlMzG1rT7edniArI7F7VqhA4DG3iFbdImBXFuH9uf2EL9RaGQ7zz6hTMgonKKozlqDmlHYZ09ezfAn9eaOueMhzY18WhYTUBt1+mNOIBacDBJU4P1F0ecl0GIMB/Ld3DjyweskintihljX5P5BI/AI11YD4DksRz31/lBd8vAkzGaeBbFhmg6bZSLn/lrrU5Cgr9wdNQKcjlXrlMxyFZCwZz/o7Sv13u2u84rLQenKP33Q89z1HXXcukPmsTxCeYBJ43zAw6QhgWpyRWXtbZKfL5F1hTCsH5X3Azxl0XA5FTmuVar8Q7qwBDnwIesOJEhWUYpOmZqvwCBykvMT0Zumo8JVcVrdPNPtb8hdt3PNNi5dQGUMz71/UO+BevHSR6sG2YyuO/5OX/V1Hf25ouEFrYcCue4xK3IWYY=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(346002)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n Qixz6Ndp+PD+PNP9ReAHGd03QV6WO3vJTvztzLHnYsLYJ2xKsMKelzVSZ5KQmFV7YXMlSSQpdC30MX3zKS/nSt1K5nAJh7W6FthiPeZTMSHXGTH2/FTMf1RCIfvkumCcuiaAy9dRjDq1zn7LbizTN6Drnte0yl15kgI2RFgd8lAUY/GY1PXD8lyPv1KRp1vxbMvBiMEy1LB3NcZdUbjn0cd+k9BwWorfOyHSIE2/ijAGbLBBSLGBWvxS8XV1S8gOWvLeayTBGKu748zjL0/kultrytytQXEFhq/Q5znYVCXWiy51KuT138+tGzWtO86uFXzLRSIP+KyUjhr5wmGC3RrV47O7IU1UpzHKnGr0U3ep5QbSzSXOEcxL2/KeovvtBTfMHalbKOhiRD4OFMFZlrUGGvf6HpzDNJ+sKNrsY/MZoex0gQmnpZAQbvohUhxSYc/QJ5zi5Em1Ks/qQZrrjjfDkKKaN2vuaqq58S9i4UxIgnC+aQjo9vdqqDQ8AwTsQLutB7aSexPbMk5oMVPNEJQSPOQ/hJogY+ZlxYcMGMZJ58UXgt1HLUb9hF3N8KpUYGL0jKNzUkzYSSUD8t89AxYqg/o57c45vog78k71ziW0DoFzcq/ofiP9uXfUSH7X5qNzGJ/RWe/wdWYaBdjcELrmRXz4wMg5ghGRUibsK992ws6j56pgGpuzWsAge3csc6Ym0KXTjZKZYYndtJJOCnBxeS07AEBhI7YDDTJsGHcHbb+3dxkFlo4YZnWZg8pxPoviNDJKXCiMShiz6Bnil+phyCk7qPt2TK20TvR1ih8l9rxGLhmi5UtL0fK1J47RUdWwAwYgo5Ul65J5FbEA7wiHw76F1otGUdWNejrO7uw5mxkwdsQfQkq1v3k0TvKBqUx7sNreCBZh5JEgd7OA78XR47B9NkM7T59bkwab4dB/koPaICVHqTCbw1pwGje/VB8jjJPU1sq2lpMM6EP0xKwe3jNMPSZf9z1OrQeaQKVP3lnXF0XRWv0Mq8IVKU/rgTlM7zOPsNJn0UCiC6aJWRvG2gInCPKrQcLISj9GEiUkS8WcXBS2+I32eVqSHYHPb/7Qj8X2VNj8MAgHH/mZImP+PiDMHHOjn+IkEOtiuK0NG9wHIZGeHQ1Zs5Tl+/4IzgEpxwvTOdFY3OP5Hvc+57yYkfrdSiADXo4Fxk8jgmEYZ8mKQNsgwF0fdQGBCbqozcb7uKMiuItnQOYq5XWwsBrqPmgXhGRo2z4Qn7VjUXh9S8EQcxeYxqJ3pPkAHz9LggzLUkg/BWlk7SfVC3aqoVvKFSzfft+2nK4a3vxVwxfGjNEwxMxAUJqU0NexeXMeEOmoESQ5srqGit4aDImAN4GK+pSHtuEtKRqufiCTHEaAWUHh1DyJJU13tRPTd5n056VptLvBKKzlzPABAqRr4tmwPem6yDY4dEf0CzGS4fSK1l5R4Lfd5kAw+++7PQBn0UubnaeaXN+hk4fX2jdcmCSQDLJpgMFgTFHgO4xbH7nI+w5Mpo5AZ0tMZDc37AcdUMGkqvUV3oYI11iG8i1R7C3yVPvYLCq0Btth3rEwC1SS7aJgRce2CAlnlR9Px8YuNZQfIk2f9wj4SgkKsH6hYQ==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 2217b066-3636-4955-242e-08dbd782a535", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Oct 2023 06:53:52.3461 (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 4p6GEmCP15YjT1KuXBP3Z3LbqXiKRltDWOaieSkBH2P2vhx4vOrEY72NKGq/t+wfL/mGpO4vVoaHHuWtN5pJHa5dwA5jGVJ2q/otWEwqnE4=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA1PR13MB6055", "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": "Macro 'NFP_HASH_OFFSET' and 'NFP_HASH_TYPE_OFFSET' are unused, so remove\nthem.\nMacro 'NFP_MAX_PHYPORTS' and 'MAX_FLOWER_PHYPORTS' are redundancy, so\njust keep the first one.\nMacro 'NFP_NET_CFG_SPARE_ADDR', 'NFP_NET_CFG_RX_OFFSET_ADDR' and\n'NFP_NET_CFG_RX_OFFSET' are redundancy, we just keep the final one.\nRemove the unneeded macro 'NFP_NET_DEV_PRIVATE_TO_PF', and adjust the\nrelated logic, to make it easier to read.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/common/nfp/nfp_common_ctrl.h | 17 -----------------\n drivers/net/nfp/flower/nfp_flower.h | 3 +--\n drivers/net/nfp/nfp_ethdev.c | 12 ++++--------\n drivers/net/nfp/nfp_net_common.c | 2 +-\n drivers/net/nfp/nfp_net_common.h | 3 ---\n drivers/net/nfp/nfp_rxtx.h | 3 ---\n 6 files changed, 6 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/common/nfp/nfp_common_ctrl.h b/drivers/common/nfp/nfp_common_ctrl.h\nindex f92ce50fc0..7033c8ea00 100644\n--- a/drivers/common/nfp/nfp_common_ctrl.h\n+++ b/drivers/common/nfp/nfp_common_ctrl.h\n@@ -196,11 +196,6 @@ struct nfp_net_fw_ver {\n #define NFP_NET_CFG_START_TXQ 0x0048\n #define NFP_NET_CFG_START_RXQ 0x004c\n \n-/*\n- * NFP-3200 workaround (0x0050 - 0x0058)\n- * @NFP_NET_CFG_SPARE_ADDR: DMA address for ME code to use (e.g. YDS-155 fix)\n- */\n-#define NFP_NET_CFG_SPARE_ADDR 0x0050\n /*\n * NFP6000/NFP4000 - Prepend configuration\n */\n@@ -210,18 +205,6 @@ struct nfp_net_fw_ver {\n /* Start anchor of the TLV area */\n #define NFP_NET_CFG_TLV_BASE 0x0058\n \n-/**\n- * Reuse spare address to contain the offset from the start of\n- * the host buffer where the first byte of the received frame\n- * will land. Any metadata will come prior to that offset. If the\n- * value in this field is 0, it means that the metadata will\n- * always land starting at the first byte of the host buffer and\n- * packet data will immediately follow the metadata. As always,\n- * the RX descriptor indicates the presence or absence of metadata\n- * along with the length thereof.\n- */\n-#define NFP_NET_CFG_RX_OFFSET_ADDR 0x0050\n-\n #define NFP_NET_CFG_VXLAN_PORT 0x0060\n #define NFP_NET_CFG_VXLAN_SZ 0x0008\n \ndiff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h\nindex 7d442e3cb2..a989c4a8b8 100644\n--- a/drivers/net/nfp/flower/nfp_flower.h\n+++ b/drivers/net/nfp/flower/nfp_flower.h\n@@ -31,7 +31,6 @@\n */\n #define FLOWER_PKT_DATA_OFFSET (NFP_NET_META_HEADER_SIZE + NFP_NET_META_FIELD_SIZE)\n \n-#define MAX_FLOWER_PHYPORTS 8\n #define MAX_FLOWER_VFS 64\n \n /* Forward declaration */\n@@ -78,7 +77,7 @@ struct nfp_app_fw_flower {\n \tuint64_t ctrl_vnic_tx_count;\n \n \t/** Array of phyport representors */\n-\tstruct nfp_flower_representor *phy_reprs[MAX_FLOWER_PHYPORTS];\n+\tstruct nfp_flower_representor *phy_reprs[NFP_MAX_PHYPORTS];\n \n \t/** Array of VF representors */\n \tstruct nfp_flower_representor *vf_reprs[MAX_FLOWER_VFS];\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 8e69fa67b2..7c5b780e82 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -56,7 +56,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n \n \tnet_hw = dev->data->dev_private;\n-\tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tpf_dev = net_hw->pf_dev;\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n \thw = &net_hw->super;\n \n@@ -261,8 +261,8 @@ nfp_net_close(struct rte_eth_dev *dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \thw = dev->data->dev_private;\n+\tpf_dev = hw->pf_dev;\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n \n@@ -482,9 +482,10 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tstruct nfp_app_fw_nic *app_fw_nic;\n \n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\tnet_hw = eth_dev->data->dev_private;\n \n \t/* Use backpointer here to the PF of this eth_dev */\n-\tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(eth_dev->data->dev_private);\n+\tpf_dev = net_hw->pf_dev;\n \n \t/* Use backpointer to the CoreNIC app struct */\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n@@ -495,11 +496,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t\treturn -ENODEV;\n \t}\n \n-\t/*\n-\t * Use PF array of physical ports to get pointer to\n-\t * this specific port.\n-\t */\n-\tnet_hw = app_fw_nic->ports[port];\n \thw = &net_hw->super;\n \n \tPMD_INIT_LOG(DEBUG, \"Working with physical port number: %hu, \"\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 10f6298f74..d43a071a42 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -1172,7 +1172,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev,\n \tif (hw->ver.major < 2)\n \t\thw->rx_offset = NFP_NET_RX_OFFSET;\n \telse\n-\t\thw->rx_offset = nn_cfg_readl(&hw->super, NFP_NET_CFG_RX_OFFSET_ADDR);\n+\t\thw->rx_offset = nn_cfg_readl(&hw->super, NFP_NET_CFG_RX_OFFSET);\n \n \thw->super.ctrl = 0;\n \thw->stride_rx = stride;\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex a23b5be968..829e9c5333 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -238,9 +238,6 @@ int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size\n int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size);\n bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version);\n \n-#define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\\\n-\t(((struct nfp_net_hw *)dev_priv)->pf_dev)\n-\n #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\\\n \t((struct nfp_app_fw_nic *)app_fw_priv)\n \ndiff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h\nindex 956cc7a0d2..ff1019b690 100644\n--- a/drivers/net/nfp/nfp_rxtx.h\n+++ b/drivers/net/nfp/nfp_rxtx.h\n@@ -10,9 +10,6 @@\n \n #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK)\n \n-#define NFP_HASH_OFFSET ((uint8_t *)mbuf->buf_addr + mbuf->data_off - 4)\n-#define NFP_HASH_TYPE_OFFSET ((uint8_t *)mbuf->buf_addr + mbuf->data_off - 8)\n-\n #define RTE_MBUF_DMA_ADDR_DEFAULT(mb) \\\n \t((uint64_t)((mb)->buf_iova + RTE_PKTMBUF_HEADROOM))\n \n", "prefixes": [ "v2", "05/11" ] }