From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFF45431D5 for ; Sun, 22 Oct 2023 16:34:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E936641141; Sun, 22 Oct 2023 16:34:05 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2062.outbound.protection.outlook.com [40.107.237.62]) by mails.dpdk.org (Postfix) with ESMTP id 6FC75410FD for ; Sun, 22 Oct 2023 16:34:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SjOzEe88RxDU9qDZEcJAf02eW5audEQyD9MopNhahxHyJa8WLsZ1VvRZtj8XAJxMvVnFYtYYZ/nwYXtACkQFKPXEZa9kwML9ytOmogPslq/2KiaE0dT29MUsL8IzwxIs8zhQxGiKV9rGVoE5F+8rSJR0E9hjTeEm39OC2flFVT/Xa/ntU4yVYtHYeoji9J26QPMsWnn+P1yXV1C/wsXwn/zM6FYdD8F4YZwGsEgE3/8pKVyQdNjxDQoDUEhMFu0zuRxng3qqTnsJvaI8I9cAC47CqPdEySer3APDmxgmcKwFpG1ZLvXZ1A0uphNpKaVXn2caSlgtz91bLK1Phj8j9g== 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=76Eir9RFnn/z/1gWZ/pBr/xVV91FhHEKmqGPhXEwWsQ=; b=f8ZvMZ1/O46OBNT+YU78pNftpCzz5I1PvKYxAyE1CDg59SzpmCJZMR8BdknK4wiyAZNgeJzaT8HHSSHHGBe8M0/ZIdN29gMuEwpQz+N7x+97Gvu6EE0pqosBnxVseaZY1oEt4AaCsUS+auk2ASQdP90xhUDw0gKQFg5tM68AwQ+aKncnlLsPvWKyyOJCe+DHvptCC8dr6T1ZHzaRt+vyCLBERxYw3W30UUJ43ZeWEj/V7woFH9m+5cF9Cv0s+pKE3UYjo3G65f38HCU957UcOOEdjFfUFVspFyCnLayAAV0IziAECGAV+Vzy/ectWmbXB9/F+F9OmRsv+mzD+9OGQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=76Eir9RFnn/z/1gWZ/pBr/xVV91FhHEKmqGPhXEwWsQ=; b=QIriX/DY7dul7w/iG45f3VPDn+sUHE5RRTJTx/X05oz4/2vKHvyUbWEGNy+HiPGC3Khwd/psXh3qbGzsTJC+V8aErwMCZ1pBSK6e1go8IfMQVIhMbTBvPTA6uencBt0GYFa4ZzDEAYBgqt2vcBb1hWNsoiZsQ2S2tNA+FY4WU0euU7W5y7IxgKmP7CLI9zvTE0V1Uny3LtNnmobFMhBKkZkskVNCo8on+FohdIY83t+yL+Y2QTUVfY0h88aSqMY1driNoXj04L3ETr6tzQswsrJhM4o20NaUvg3HRqjEgX2gOxvLGbM/rDUY375TiP8/ou4/yEpgJ+qg2X59vTAr+w== Received: from CY5PR15CA0225.namprd15.prod.outlook.com (2603:10b6:930:88::26) by DS7PR12MB6309.namprd12.prod.outlook.com (2603:10b6:8:96::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:34:02 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:930:88:cafe::8) by CY5PR15CA0225.outlook.office365.com (2603:10b6:930:88::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.32 via Frontend Transport; Sun, 22 Oct 2023 14:34:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE36.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:34:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:33:58 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:33:56 -0700 From: Xueming Li To: Jie Hai CC: Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix Rx and Tx queue state' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:34 +0800 Message-ID: <20231022142250.10324-126-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|DS7PR12MB6309:EE_ X-MS-Office365-Filtering-Correlation-Id: 229c440d-507f-4ce6-d935-08dbd30befe1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ROiGEgObmlf2S6KMHNpN+0sQzVkGfgjnEGFHzsHTWAbkxv/8nANcvmgfW8+Ceyiq/7Canhxm8Oli9goCzrYR3LfyfrMAgTR5osD7Mxqse7aI/WaRFk4UD192Rvs4/ZqEyExvuZM1tQ9O9t7rTd5HyHoJcwESpiTv7F2YJj6wnI6LBdc7wZmnaBiMEBwm30w+rD15JnZEy2r5P1kA2+a0kgH8J25RpWDnyGemeBaZKFaRq/Ls7ZMCLskrzqY305z6DILYLvgDGk0UKk6oO5FsLk2zR4/tHbSuM1duOYFGTrP4Vbck1EpZ5/NvNZ8B/h2j4TJviZ5cpcwoSVSxmMdDvkNJMTS2pz9AOmip2q9kwBbaXLEyiH3ebRBhnvuKmaZy2EFjjR5y36d5PxnA9C3APa1UA9JI7J6zaKiy8BUshw1XvnBYAiQiTwnvo6bBkx/tOc6+t+QvJ/W90LiglVJ7Pfzg6fd0MgdqgJ7UPMFx19Hwxrbjb3sC93EgvoI/UTgHRgWKAws6wNs4WouSzzgrvbMB2Jaz+npjAWMskzI5Jmmc20NBOGiAUsK4mE0kIQOQZix3eZBAgSu1YV+2755QGkcLMuY3ZSrAJya5LupeFF19x6ws2ekzogn3+uwz5A4MYySwAwiZVI1GsOm20zeRCTkr89iFD5dJQxyunBaAK7ZHNw3C+/s86Fj99bxqd3tA53n8DIv7VDnwT4kwGNBwvX6NBhI7Kl/ZZk/IXfvZVXiyfsJRfElBQt9V9twZWwkHlHIHSnHw4QfE8uzFxgvQyw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(396003)(136003)(39850400004)(230922051799003)(1800799009)(82310400011)(186009)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(40480700001)(36756003)(40140700001)(55016003)(40460700003)(54906003)(316002)(6916009)(70586007)(70206006)(86362001)(82740400003)(356005)(7636003)(53546011)(36860700001)(83380400001)(6286002)(16526019)(426003)(2616005)(1076003)(336012)(26005)(6666004)(7696005)(4001150100001)(19627235002)(30864003)(2906002)(8936002)(966005)(478600001)(41300700001)(47076005)(8676002)(5660300002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:34:02.3995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 229c440d-507f-4ce6-d935-08dbd30befe1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6309 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4e28c37ff58288ae06c051978f6f0b5f7316831a Thanks. Xueming Li --- >From 4e28c37ff58288ae06c051978f6f0b5f7316831a Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:48 +0800 Subject: [PATCH] net/nfp: fix Rx and Tx queue state Cc: Xueming Li [ upstream commit c46216e77ac3b1890eb622bea4bcc8c54f9da820 ] The DPDK framework reports the queue state, which is stored in dev->data->tx_queue_state and dev->data->rx_queue_state. The state is maintained by the driver. Users may determine whether a queue participates in packet forwarding based on the state. Therefore, the driver needs to modify the queue state in time according to the actual situation. Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information") Signed-off-by: Jie Hai Acked-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 8 ++++++++ drivers/net/nfp/flower/nfp_flower_representor.c | 12 ++++++++++++ drivers/net/nfp/nfp_common.c | 2 ++ drivers/net/nfp/nfp_ethdev.c | 6 ++++++ drivers/net/nfp/nfp_ethdev_vf.c | 6 ++++++ 5 files changed, 34 insertions(+) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index c14a481a81..9872e010d2 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -84,6 +84,7 @@ int nfp_flower_pf_start(struct rte_eth_dev *dev) { int ret; + uint16_t i; uint32_t new_ctrl; uint32_t update = 0; struct nfp_net_hw *hw; @@ -136,6 +137,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) return -EIO; } + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; } @@ -158,11 +164,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) { this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } for (i = 0; i < dev->data->nb_rx_queues; i++) { this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } if (rte_eal_process_type() == RTE_PROC_PRIMARY) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index b9f2f631ff..32c4574bdc 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -300,6 +300,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) { struct nfp_flower_representor *repr; struct nfp_app_fw_flower *app_fw_flower; + uint16_t i; repr = (struct nfp_flower_representor *)dev->data->dev_private; app_fw_flower = repr->app_fw_flower; @@ -311,6 +312,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) nfp_flower_cmsg_port_mod(app_fw_flower, repr->port_id, true); + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; } @@ -319,6 +325,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) { struct nfp_flower_representor *repr; struct nfp_app_fw_flower *app_fw_flower; + uint16_t i; repr = (struct nfp_flower_representor *)dev->data->dev_private; app_fw_flower = repr->app_fw_flower; @@ -330,6 +337,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) repr->nfp_idx, 0); } + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + return 0; } diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index b673370f20..b75fd22e03 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1337,6 +1337,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_rx_queues; i++) { this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1362,6 +1363,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) { this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 29491f6e6d..689e26f1e1 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -70,6 +70,7 @@ nfp_net_start(struct rte_eth_dev *dev) struct rte_eth_conf *dev_conf; struct rte_eth_rxmode *rxmode; uint32_t intr_vector; + uint16_t i; int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -174,6 +175,11 @@ nfp_net_start(struct rte_eth_dev *dev) hw->ctrl = new_ctrl; + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; error: diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 1877d6b76b..268820cbea 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -45,6 +45,7 @@ nfp_netvf_start(struct rte_eth_dev *dev) struct rte_eth_conf *dev_conf; struct rte_eth_rxmode *rxmode; uint32_t intr_vector; + uint16_t i; int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -124,6 +125,11 @@ nfp_netvf_start(struct rte_eth_dev *dev) hw->ctrl = new_ctrl; + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; error: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.856959200 +0800 +++ 0125-net-nfp-fix-Rx-and-Tx-queue-state.patch 2023-10-22 22:17:34.406723700 +0800 @@ -1 +1 @@ -From c46216e77ac3b1890eb622bea4bcc8c54f9da820 Mon Sep 17 00:00:00 2001 +From 4e28c37ff58288ae06c051978f6f0b5f7316831a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c46216e77ac3b1890eb622bea4bcc8c54f9da820 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 98e6f7f927..2c64ff5fc0 100644 +index c14a481a81..9872e010d2 100644 @@ -30 +32 @@ -@@ -79,6 +79,7 @@ int +@@ -84,6 +84,7 @@ int @@ -38 +40 @@ -@@ -131,6 +132,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) +@@ -136,6 +137,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) @@ -50 +52 @@ -@@ -153,11 +159,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) +@@ -158,11 +164,13 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) @@ -52 +54 @@ - this_tx_q = dev->data->tx_queues[i]; + this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; @@ -58 +60 @@ - this_rx_q = dev->data->rx_queues[i]; + this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; @@ -65 +67 @@ -index e4c5d765e7..16381d8f05 100644 +index b9f2f631ff..32c4574bdc 100644 @@ -68 +70 @@ -@@ -310,6 +310,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) +@@ -300,6 +300,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) @@ -74 +76 @@ - repr = dev->data->dev_private; + repr = (struct nfp_flower_representor *)dev->data->dev_private; @@ -76 +78 @@ -@@ -321,6 +322,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) +@@ -311,6 +312,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) @@ -88 +90 @@ -@@ -329,6 +335,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) +@@ -319,6 +325,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) @@ -94 +96 @@ - repr = dev->data->dev_private; + repr = (struct nfp_flower_representor *)dev->data->dev_private; @@ -96 +98 @@ -@@ -340,6 +347,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) +@@ -330,6 +337,11 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) @@ -109 +111 @@ -index 5683afc40a..7e93221532 100644 +index b673370f20..b75fd22e03 100644 @@ -112 +114 @@ -@@ -1926,6 +1926,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev) +@@ -1337,6 +1337,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev) @@ -114 +116 @@ - this_rx_q = dev->data->rx_queues[i]; + this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; @@ -120 +122 @@ -@@ -1951,6 +1952,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev) +@@ -1362,6 +1363,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev) @@ -122 +124 @@ - this_tx_q = dev->data->tx_queues[i]; + this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; @@ -129 +131 @@ -index ebc5538291..a2fa67bc50 100644 +index 29491f6e6d..689e26f1e1 100644 @@ -132 +134 @@ -@@ -52,6 +52,7 @@ nfp_net_start(struct rte_eth_dev *dev) +@@ -70,6 +70,7 @@ nfp_net_start(struct rte_eth_dev *dev) @@ -140 +142 @@ -@@ -167,6 +168,11 @@ nfp_net_start(struct rte_eth_dev *dev) +@@ -174,6 +175,11 @@ nfp_net_start(struct rte_eth_dev *dev) @@ -153 +155 @@ -index 0c94fc51ad..5363799115 100644 +index 1877d6b76b..268820cbea 100644 @@ -156 +158 @@ -@@ -36,6 +36,7 @@ nfp_netvf_start(struct rte_eth_dev *dev) +@@ -45,6 +45,7 @@ nfp_netvf_start(struct rte_eth_dev *dev) @@ -164 +166 @@ -@@ -112,6 +113,11 @@ nfp_netvf_start(struct rte_eth_dev *dev) +@@ -124,6 +125,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)