Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133543/?format=api
{ "id": 133543, "url": "http://patchwork.dpdk.org/api/patches/133543/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231028061558.1842855-5-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": "<20231028061558.1842855-5-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231028061558.1842855-5-chaoyong.he@corigine.com", "date": "2023-10-28T06:15:51", "name": "[04/11] net/nfp: remove the unneeded data abstraction", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "faf10c51fb0d672b2908d3e6d05f8e3f1f31913f", "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/20231028061558.1842855-5-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 30037, "url": "http://patchwork.dpdk.org/api/series/30037/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=30037", "date": "2023-10-28T06:15:47", "name": "Clean up NFP PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/30037/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/133543/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/133543/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 4F77943220;\n\tSat, 28 Oct 2023 08:17:02 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B0FAF4064C;\n\tSat, 28 Oct 2023 08:16:38 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2090.outbound.protection.outlook.com [40.107.220.90])\n by mails.dpdk.org (Postfix) with ESMTP id 72104402F1\n for <dev@dpdk.org>; Sat, 28 Oct 2023 08:16:36 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB5551.namprd13.prod.outlook.com (2603:10b6:510:139::17)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sat, 28 Oct\n 2023 06:16:33 +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:16:33 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=mFn7kB6NLru8PWuYAbTGDKWEYJoZs0hRUSr1SJwDSbJ0KNkcQV+PrVOLFz0r2/ec2KWkhuryTUJIS/c5tilW7OtZFMXU1lPN1jhovKhqLyZaOeoq58+/UzQ0ywlml+0uMeXBcwCkoEa3tIh0Xnx+lBOKqG8nPyRoyQYch5vKKJfKP3r5T2sO8ke9+Qh0DLsywX/bUOh3vLFesBBej94FylcvGuOeUlRTJj8VhonTfUskXTKWL6PPfMEXw0lzB5Md9QX6lAwxxcyL+gGp4Tt9T9mR24FHC1WfWOsnCQAOeNNpTa3bKHqQB/jTDvhOLm8aKfpZRx80omiu+gN0Qzqp9A==", "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=bmiCLlC6a5ilRc/crGtpsqo2qosj5CyVkTJiPAnfy/M=;\n b=YZcEDD1lVbhahiwz20dQch/Dkvf6rnL15UCMDX9Uz/aR6JuagQ8Vkv1z6Yz7Fgte1nEHkIN/qHwsX+7nfhSS8c0pbR+6qlYoU3WF4YqDeT/1VA7OZCtVbQqxAiRlDFOtwpXgYyzZNp5Qu18aZYKjyU/P37Nq0QQV6yh2I2fAtHtIfrC953+jd1oGBUTGT1GxB6ZM+Ha1u+vcowwZBIW6QZRDlXrgS+BVRKS7xTmsCxBmSj9Tkec7FaGWwDMTk1kBAGzPGU+3fqj//1/ds1dIq1QN2xbjXSwxURwTfZzh0ASCJRthsc0in1wZl4V6LLF1ekYDBpEo74mXKERbg7T3WA==", "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=bmiCLlC6a5ilRc/crGtpsqo2qosj5CyVkTJiPAnfy/M=;\n b=j4WgeSm2d9w7GRLKq819ZeqtH1xIJCIRFUOsSx1IcUKTi/8ORg3JewUnTg36CiR4nIs8rG3/3pU0yHQkBX5DsGamC4ZPObapba+fels4sZklGHK1Xm33l3rhiV/LUHNnjykxt7bmN6wgnrcO4+SErZvIoOde3FY8Bn/Lr+EIk3w=", "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 04/11] net/nfp: remove the unneeded data abstraction", "Date": "Sat, 28 Oct 2023 14:15:51 +0800", "Message-Id": "<20231028061558.1842855-5-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231028061558.1842855-1-chaoyong.he@corigine.com>", "References": "<20231028061558.1842855-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SJ0PR03CA0246.namprd03.prod.outlook.com\n (2603:10b6:a03:3a0::11) 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_|PH7PR13MB5551:EE_", "X-MS-Office365-Filtering-Correlation-Id": "0858cd9e-0850-4b0f-a5cf-08dbd77d6ecb", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n ADym11w51hARrw2uu95AxeLhVSOfomw1HmBtTK2vwgP8iMySX0SaKwnZHQMo5Ln0tgFhGRpLd6LzlgnkSUVISWTGd7VJTX3M9EUuDfsiKSd4OdU4iD+ZDOnQ+NV1ku2YjR7hi4oEpkov3ClMQ5MEZG6VG78yoSjkg5dh8cLWi/SRsl9tf5HHmbHKTyqObKDOkXyKeo81Jza8gtzpE64ibjycIrHnOia0W+L7Gj5vKR7+H8vj0yKiimfOShazdsfsmgrOyN47//VNRl9+ogRvCi2Yue7KpkCHQuVsz5hcXxdPkSZ0ko1yBxzlQYUuLXDKuDVPU5lcODsiDNp3VNBtOYqqJAhDZbPDMF7nM94V/jb6+1FPBhNDw9Gh1KS5FV+TWrjPvVJe4d7L81TSOh/hCnYW/grztwFEXgraddzv00olY87bGF7SV+VhSNQ48najbH6YvcUPLAKibE4DS8VKAidznSFNqrS9J6H+CY483vUyK8d6TkqaRZQcGr4WTG7Uukn38wVD3BbDbUUjN/KDuTgJEXWwk/UCjkXYGq3dh/eMqEiTvAlECNpWFKg6Bf0raNQ/AbtcuHImnVF7EODhEvVkHtVi+h4y+ax9LFhBu3cAycu73AJX+gtWMKJhuLXATqDOU7mXtoHyefBP66a9dEOQ38FhQxnpzQYptJkGE0E=", "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)(376002)(39830400003)(346002)(136003)(366004)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(54906003)(107886003)(6506007)(26005)(6666004)(52116002)(83380400001)(2906002)(44832011)(5660300002)(4326008)(8676002)(2616005)(6486002)(41300700001)(478600001)(30864003)(8936002)(66476007)(38100700002)(6916009)(316002)(66946007)(86362001)(66556008)(36756003)(1076003)(38350700005);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n Ijtp596mS7+bEYDgRY5hW+BGNR7gzQEGvUNJPwmxRsIQ0U2ueBJn37wVhRbbHz274bIQybd7hk7FVeSNZYq5oac5SWYNQor0cq/DEomWI1DlGq3FaRYYNlCDgmziSQomGqJNDHbo2S9b8RElGKAuRtRtZ7Jf5xMrxvqGsnFoZZt/nEY10L6UXq37us3DoK6YJxU7gJFajVpvYX4sV70YPmljy89DH8by1MZA2GX+0TFRWcDgpkVL0eCm5UArMiYgJBcs/D5DfqvxXtYjgNgam0RoPNRHJuRYr7oCzAch/mNGE7022Hiscs7xJ73QU2jiNpFe9/12myEXcmWfQJ1qiGSQdsaGMFEEl0g0KcNmidPgKTfESkYtCjjtTBIB/NI8DTTSjkGUTOX0/GoSyb586gkbc/ztN2p2JOCIX5cT6WO7TErhNtPbuh1lVY54G1vkoCIQ/EDfntUOv7MvRnTPEN6nuHOWMjunizW+6hmhVi/6/R4OxWn8KI6FMXbHMVc7bbNMFGrZ2AsreH6FlLI68CsGUVoQATtbCNjdQzP40fJNpNTkqkJ9BOPqKsQB6c1H+HW995QGq2HrfJr42Zv279JbYns2vvPg2wkel29PvvN1RFoK+91+QMd28qHhazbnAPMHc1vUMd5k3F/De8rUtYI37yc/ESgqcp8tkVQd3yEvfbjXkndl8zHkOTyN6/aWznOgyuJ4xm/ngTDCK+e7lbDHkv+QLt76n5sKlQsDT//mhoEY5NhI9mNYqzFuuKr/98/jARdDcJLJxnVc+buRHh43Sqk+TWP6MvMHQryzKY/i7mtnTJC+RiLneMwHkeWeTRU8fXRmjVidNF5pSNE/obRK/lyq62IiTZVoR4sSmz46KsXMiW1zxaLhPcEWpxx7Bk4r96G+nxd7KIRcJQoHgAxb8LVMzAHExQA7lCblmCym7hqaZwgXmvlHR9DwYarQsatKJJzkj2kls5CjCAKt26j8RuPz2BC56idiw1PDnv3K6oesnoEN2HV+uhtfG8Ts1QcwpzG8yyGHFOljuHIbJ6XCkHoITKXET9+vsoli3VGwvrz0tjD0uaCZgeipyfziq7m8VIL26mwIrbbs/M05lQP1UEwMIheK5eVD5bW/J3bcj/o5UF5gx8JhFQPRNpMlva0DO21Sno9SYHLOogAi+3jSwymdUYLPXCUeRPyNrnFwMd5J9u5mQZv59q2fEk4IHwE3eNe2lRKqDRLuekCeWNkutWvFtVCFRculeB94eRjfganWsWS511DPCerUO0P1BKrEdJmvKHpntT9lH+xyzyDbg6SjvVTwwq8KTmLpz3Jj9flJLyjY3LTfpZkktw9lmdvwGw2J2t7hgOoOi3VtEK5hSrLjMu4VOUNbAlO/42o8JzwrLYi2hmIJAtfd5/B/Y0/UH/QQ8Hw/134mN4ARJIhFlBjqb4qY1MtUTv9jyACQyw3ThBsugV0T6i9jVxbckmoC4F5LSuL/X7Qhrsf2zqSP9evgByVnqu3+Ihvui/Crvn2CcpGPVgXKDi7+1SLt+dUSLq+B+1R2vZXOQRzSSyG8Wd5YKMxlfnrBpsi4tykzQUzxj8CyCgZTI/gGp2kncG4PdejngLwVTAg0JY9u5Q==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 0858cd9e-0850-4b0f-a5cf-08dbd77d6ecb", "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:16:33.6014 (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 yRHAfe5rlDc3OA8tXZ1i4N0s2i35sKGHnY4IjAcGaNq46YxWxUF7tZJ3uiG/xYUEOTDm46ZWmiKuz0NrTMyJJN7TczTJlgouSMgNmLtrEtU=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB5551", "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": "The data structure 'struct nfp_net_adapter' has only one data field and\nwe won't extend it in the future, which makes this abstraction unneeded,\nso remove this data structure and the related macro\n'NFP_NET_DEV_PRIVATE_TO_HW'.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 2 +-\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 2 +-\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +-\n drivers/net/nfp/nfp_ethdev.c | 18 +++++-----\n drivers/net/nfp/nfp_ethdev_vf.c | 6 ++--\n drivers/net/nfp/nfp_ipsec.c | 18 +++++-----\n drivers/net/nfp/nfp_net_common.c | 55 ++++++++++++++---------------\n drivers/net/nfp/nfp_net_common.h | 3 --\n drivers/net/nfp/nfp_net_ctrl.c | 2 +-\n drivers/net/nfp/nfp_rxtx.c | 4 +--\n 10 files changed, 54 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex f3fedbf7e5..246dd2d454 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -848,7 +848,7 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev,\n \t}\n \n \t/* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */\n-\tpf_hw = rte_zmalloc_socket(\"nfp_pf_vnic\", 2 * sizeof(struct nfp_net_adapter),\n+\tpf_hw = rte_zmalloc_socket(\"nfp_pf_vnic\", 2 * sizeof(struct nfp_net_hw),\n \t\t\tRTE_CACHE_LINE_SIZE, numa_node);\n \tif (pf_hw == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Could not malloc nfp pf vnic\");\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex c85fadc80d..3f9909c6e0 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -377,7 +377,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,\n \tuint16_t tx_free_thresh;\n \tconst struct rte_memzone *tz;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n \ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex 10e6982c95..fe87ea3e25 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -454,7 +454,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,\n \tstruct nfp_net_txq *txq;\n \tconst struct rte_memzone *tz;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n \ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 0fed0ef72d..8e69fa67b2 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -55,7 +55,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n \thw = &net_hw->super;\n@@ -201,7 +201,7 @@ nfp_net_stop(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_net_disable_queues(dev);\n \n@@ -224,7 +224,7 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n \t\t/* Configure the physical port down */\n@@ -239,7 +239,7 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n \t\t/* Configure the physical port down */\n@@ -262,7 +262,7 @@ nfp_net_close(struct rte_eth_dev *dev)\n \t\treturn 0;\n \n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\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@@ -350,7 +350,7 @@ nfp_udp_tunnel_port_add(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \tenum rte_eth_tunnel_type tnl_type;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tvxlan_port = tunnel_udp->udp_port;\n \ttnl_type = tunnel_udp->prot_type;\n \n@@ -388,7 +388,7 @@ nfp_udp_tunnel_port_del(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \tenum rte_eth_tunnel_type tnl_type;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tvxlan_port = tunnel_udp->udp_port;\n \ttnl_type = tunnel_udp->prot_type;\n \n@@ -828,7 +828,7 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,\n \t\t\tgoto port_cleanup;\n \t\t}\n \n-\t\thw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\t\thw = eth_dev->data->dev_private;\n \n \t\t/* Add this device to the PF's array of physical ports */\n \t\tapp_fw_nic->ports[i] = hw;\n@@ -1067,7 +1067,7 @@ nfp_secondary_init_app_fw_nic(struct rte_pci_device *pci_dev,\n \t\t}\n \n \t\teth_dev->process_private = cpp;\n-\t\thw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\t\thw = eth_dev->data->dev_private;\n \t\tnfp_net_ethdev_ops_mount(hw, eth_dev);\n \n \t\trte_eth_dev_probing_finish(eth_dev);\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex e24fec861d..cb8a37bce7 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -66,7 +66,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \tnew_ctrl = nfp_check_offloads(dev);\n \n \t/* Writing configuration parameters in the device */\n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \tnfp_net_params_setup(net_hw);\n \n@@ -258,7 +258,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \t\treturn -ENODEV;\n \t}\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \tnet_hw->dev_info = dev_info;\n \thw = &net_hw->super;\n \n@@ -393,7 +393,7 @@ static int\n nfp_vf_pci_probe(struct rte_pci_device *pci_dev)\n {\n \treturn rte_eth_dev_pci_generic_probe(pci_dev,\n-\t\t\tsizeof(struct nfp_net_adapter), nfp_netvf_init);\n+\t\t\tsizeof(struct nfp_net_hw), nfp_netvf_init);\n }\n \n static int\ndiff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c\nindex 7e26977dc1..9a0ae89af3 100644\n--- a/drivers/net/nfp/nfp_ipsec.c\n+++ b/drivers/net/nfp/nfp_ipsec.c\n@@ -579,7 +579,7 @@ nfp_aead_map(struct rte_eth_dev *eth_dev,\n \tconst uint32_t *key;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \tdevice_id = net_hw->device_id;\n \toffset = 0;\n \n@@ -667,7 +667,7 @@ nfp_cipher_map(struct rte_eth_dev *eth_dev,\n \tconst uint32_t *key;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \tdevice_id = net_hw->device_id;\n \n \tswitch (cipher->algo) {\n@@ -808,7 +808,7 @@ nfp_auth_map(struct rte_eth_dev *eth_dev,\n \t\treturn -EINVAL;\n \t}\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \tdevice_id = net_hw->device_id;\n \tdigest_length = digest_length << 3;\n \n@@ -1082,7 +1082,7 @@ nfp_crypto_create_session(void *device,\n \tsa_idx = -1;\n \teth_dev = device;\n \tpriv_session = SECURITY_GET_SESS_PRIV(session);\n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \n \tif (net_hw->ipsec_data->sa_free_cnt == 0) {\n \t\tPMD_DRV_LOG(ERR, \"No space in SA table, spi: %d\", conf->ipsec.spi);\n@@ -1163,7 +1163,7 @@ nfp_security_set_pkt_metadata(void *device,\n \tsqn = params;\n \teth_dev = device;\n \tpriv_session = SECURITY_GET_SESS_PRIV(session);\n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \n \tif (priv_session->ipsec.direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {\n \t\tstruct nfp_tx_ipsec_desc_msg *desc_md;\n@@ -1236,7 +1236,7 @@ nfp_security_session_get_stats(void *device,\n \tmemset(&msg, 0, sizeof(msg));\n \tmsg.cmd = NFP_IPSEC_CFG_MSG_GET_SA_STATS;\n \tmsg.sa_idx = priv_session->sa_index;\n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \n \tret = nfp_ipsec_cfg_cmd_issue(net_hw, &msg);\n \tif (ret < 0) {\n@@ -1288,7 +1288,7 @@ nfp_crypto_remove_sa(struct rte_eth_dev *eth_dev,\n \tstruct nfp_ipsec_msg cfg;\n \n \tsa_index = priv_session->sa_index;\n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\tnet_hw = eth_dev->data->dev_private;\n \n \tcfg.cmd = NFP_IPSEC_CFG_MSG_INV_SA;\n \tcfg.sa_idx = sa_index;\n@@ -1380,7 +1380,7 @@ nfp_ipsec_init(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *net_hw;\n \tstruct nfp_net_ipsec_data *data;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \n \tcap_extend = net_hw->super.cap_ext;\n \tif ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) {\n@@ -1427,7 +1427,7 @@ nfp_ipsec_uninit(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *net_hw;\n \tstruct nfp_ipsec_session *priv_session;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \n \tcap_extend = net_hw->super.cap_ext;\n \tif ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) {\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex ac97e3bed5..1260b9a3b1 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -252,7 +252,7 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \tstruct rte_eth_rxmode *rxmode;\n \tstruct rte_eth_txmode *txmode;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n \ttxmode = &dev_conf->txmode;\n@@ -329,7 +329,7 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_enable_queues(&hw->super, dev->data->nb_rx_queues,\n \t\t\tdev->data->nb_tx_queues);\n@@ -340,7 +340,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \n \tnfp_disable_queues(&net_hw->super);\n }\n@@ -367,7 +367,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n \t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {\n@@ -407,7 +407,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\treturn -ENOMEM;\n \t}\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tif (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) {\n \t\tPMD_DRV_LOG(INFO, \"VF: enabling RX interrupt with UIO\");\n@@ -443,7 +443,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *hw;\n \tstruct rte_eth_conf *dev_conf;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tcap = hw->super.cap;\n \n \tdev_conf = &dev->data->dev_conf;\n@@ -516,7 +516,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t\trepr = dev->data->dev_private;\n \t\tnet_hw = repr->app_fw_flower->pf_hw;\n \t} else {\n-\t\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\t\tnet_hw = dev->data->dev_private;\n \t}\n \n \thw = &net_hw->super;\n@@ -551,7 +551,7 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev)\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n@@ -588,7 +588,7 @@ nfp_net_link_update(struct rte_eth_dev *dev,\n \tstruct rte_eth_link link;\n \tstruct nfp_eth_table *nfp_eth_table;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tmemset(&link, 0, sizeof(struct rte_eth_link));\n \n@@ -654,7 +654,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev,\n \tif (stats == NULL)\n \t\treturn -EINVAL;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tmemset(&nfp_dev_stats, 0, sizeof(nfp_dev_stats));\n \n@@ -732,7 +732,7 @@ nfp_net_stats_reset(struct rte_eth_dev *dev)\n \tuint16_t i;\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \t/* Reading per RX ring stats */\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n@@ -794,7 +794,7 @@ nfp_net_xstats_size(const struct rte_eth_dev *dev)\n \tconst uint32_t size = RTE_DIM(nfp_net_xstats);\n \n \t/* If the device is a VF, then there will be no MAC stats */\n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tif (hw->mac_stats == NULL) {\n \t\tfor (count = 0; count < size; count++) {\n \t\t\tif (nfp_net_xstats[count].group == NFP_XSTAT_GROUP_MAC)\n@@ -828,7 +828,7 @@ nfp_net_xstats_value(const struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_xstat xstat;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \txstat = nfp_net_xstats[index];\n \n \tif (xstat.group == NFP_XSTAT_GROUP_MAC)\n@@ -967,7 +967,7 @@ nfp_net_xstats_reset(struct rte_eth_dev *dev)\n \tuint32_t read_size;\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tread_size = nfp_net_xstats_size(dev);\n \n \tfor (id = 0; id < read_size; id++) {\n@@ -1015,7 +1015,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tuint16_t max_tx_desc;\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc);\n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n@@ -1242,7 +1242,7 @@ nfp_rx_queue_intr_enable(struct rte_eth_dev *dev,\n \t/* Make sure all updates are written before un-masking */\n \trte_wmb();\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tnn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id),\n \t\t\tNFP_NET_CFG_ICR_UNMASKED);\n \treturn 0;\n@@ -1263,7 +1263,7 @@ nfp_rx_queue_intr_disable(struct rte_eth_dev *dev,\n \t/* Make sure all updates are written before un-masking */\n \trte_wmb();\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tnn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_RXTX);\n \n \treturn 0;\n@@ -1301,7 +1301,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *hw;\n \tstruct rte_pci_device *pci_dev;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \n \t/* Make sure all updates are written before un-masking */\n@@ -1376,7 +1376,7 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev,\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \t/* MTU setting is forbidden if port is started */\n \tif (dev->data->dev_started) {\n@@ -1412,9 +1412,8 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *net_hw;\n \tuint32_t rxvlan_ctrl = 0;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n-\n \trx_offload = dev->data->dev_conf.rxmode.offloads;\n \tnew_ctrl = hw->ctrl;\n \n@@ -1463,7 +1462,7 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n@@ -1519,7 +1518,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n@@ -1552,7 +1551,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n@@ -1602,7 +1601,7 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *net_hw;\n \tuint32_t cfg_rss_ctrl = 0;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \t/* Writing the key byte by byte */\n@@ -1658,7 +1657,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \trss_hf = rss_conf->rss_hf;\n@@ -1699,7 +1698,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \tuint32_t cfg_rss_ctrl;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n@@ -1987,7 +1986,7 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev,\n \tif (fw_size < FW_VER_LEN)\n \t\treturn FW_VER_LEN;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tsnprintf(vnic_version, FW_VER_LEN, \"%d.%d.%d.%d\",\n \t\t\thw->ver.extend, hw->ver.class,\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 6607175460..a23b5be968 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_HW(adapter)\\\n-\t(&((struct nfp_net_adapter *)adapter)->hw)\n-\n #define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\\\n \t(((struct nfp_net_hw *)dev_priv)->pf_dev)\n \ndiff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c\nindex 5135a1ad27..ea14b98924 100644\n--- a/drivers/net/nfp/nfp_net_ctrl.c\n+++ b/drivers/net/nfp/nfp_net_ctrl.c\n@@ -31,7 +31,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *net_hw;\n \tstruct nfp_net_tlv_caps *caps;\n \n-\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = dev->data->dev_private;\n \tcaps = &net_hw->tlv_caps;\n \tnfp_net_tlv_caps_reset(caps);\n \ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex 644be2700e..38ce83aa46 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -840,7 +840,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \tstruct nfp_net_rxq *rxq;\n \tconst struct rte_memzone *tz;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tnfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc);\n \n@@ -1067,7 +1067,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev,\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = dev->data->dev_private;\n \n \tif (hw->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3)\n \t\treturn nfp_net_nfd3_tx_queue_setup(dev, queue_idx,\n", "prefixes": [ "04/11" ] }