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 E847C470E5 for ; Thu, 25 Dec 2025 10:22:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1253402BE; Thu, 25 Dec 2025 10:22:33 +0100 (CET) Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011009.outbound.protection.outlook.com [52.101.52.9]) by mails.dpdk.org (Postfix) with ESMTP id 57AD1402BE for ; Thu, 25 Dec 2025 10:22:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kO+x2msWcmamXi5CCKHqtvFbAToeRw0NWxybXnF4nY7ffS1yxFzeZsltleFydL2gGl/aTGDifRGriUu52K2uLrEFKyrna4e74sPcvYxt2dYydLGbVRMPGxDokx8Ak8SdjrT+6PJkMtdoZZH+H5KsQuqmMMWsF3ui7yIsFoRZPUjCbr+3WgvPe2BvrpxfHYdPr9GyC22QCYKKaoR4kcnvANDtNqqamV06Il2/BSmrk9sh2q51jVWvOHMs2M7rmzl9l/4Y5z24fmFDN/n9g/Humu61NezDBrvRtdh6Hc4KryFsx60CX4+W0i1A5PjLe2lSBeaUuKJuTHrN3I4bzsPQ+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=LN3O5oL5aDUhaDQNUkP/NvGRPwGK7NGE20HCnn/W+mY=; b=laiwFGgTqu9Mv54fVTEPWhXBCRH2mnrHqLv9Ao9DF/sPRmVG+gLFzjvxL60LqR48SCPWiak3s6+11eYbxUzPS9vdANclPBu8XOj8WYs/ObsDOtXmK3YOu3/MWWexPgrfSdOP39U3+dxbNp5Y+4JMtqgBncbFywl62dWTMJWAR0moriHlsvR1tEgOi90wqfcXRVESYhxYYpIj+jCf64pY9pvGDC4JMkN3j5eOZNvUrgf6MVQvoBkXp9MAGSWk5HG10a9cLBVE+6nicA9doguDbhV1n/n1/ufJCdXMJ7OywLWCIibsu14b/bP1E/B47Xi5icddkrrEUgDXMngFAG6PAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=trustnetic.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 (0) 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=LN3O5oL5aDUhaDQNUkP/NvGRPwGK7NGE20HCnn/W+mY=; b=JEFAzj9xO9sJsIR5+gP7nEAtf15Pks+u189Q6EB2/VX+RdZl1WFj9stVXN4mVPYDoQ6a5Z8zDfP1VU58K15OJwjcMFAy4Rq2MuDu+39rD+4/QS+wZufQIlPwcdKj7NdjTaindcx714uICABZAI/HezYGED5vsOvk8/+qGTXtdbnYjWzS0OjBlk3u2MjzEkrp9Bey6Q4BpajT1wxwZyhS6SMI41lkGouheXxnBmOwo+RanW/EmZzZMf5yK2yYmQusvEZ30LDI+P6V9SG+XrcqTiOWXF2uHUB6gn5rH6+6RHZ+KjUkZbrTrMpAPHOo8rfM6iRAWB3MpmDUmt57tvSHAg== Received: from CH2PR20CA0022.namprd20.prod.outlook.com (2603:10b6:610:58::32) by DS2PR12MB9751.namprd12.prod.outlook.com (2603:10b6:8:2ad::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:22:29 +0000 Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:610:58:cafe::58) by CH2PR20CA0022.outlook.office365.com (2603:10b6:610:58::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:22:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:22:28 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:22:12 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:22:11 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:22:10 -0800 From: Shani Peretz To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: add device arguments for FDIR' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:17:57 +0200 Message-ID: <20251225091938.345892-36-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000140:EE_|DS2PR12MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: 30f584a2-4169-4163-0dd8-08de43972012 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cCu0Pm0GKECl6LK3e1wGlSjaDSRtxmVesZ++N/tM9IGrEWb1US9Hgq+2iMFd?= =?us-ascii?Q?ObT5PVz3xUILMDapnVpBik7Yh+fRdZTPZ5CKm+hXYM49HgWUAEG2QNHGo3IR?= =?us-ascii?Q?98Z0CCddwJMpqiWlrD0ATBV5H/1rmmdUAfjFxkrXkraBSTvK3Oze11yklhff?= =?us-ascii?Q?7WqcPYHwzlORticio7b1LgLpI5XflzzUuIwA0ZlfxbmgXO/iZrXTAcnGNX9r?= =?us-ascii?Q?VslIBy3/V+rXhIwEp8RS0LydZLlFSbAXcW2yq6BXz5E/tlT+Q6M3PmvSEywf?= =?us-ascii?Q?JwnRsBk46tmRw1ApevtzPdftDcef3GQ7qWnurFwtJ2tEYyw7gyyFbrp7db3k?= =?us-ascii?Q?SFJlA2lCySKUI4kzvAMDXNXUECVITXPjtkepqy/+bRNU8Eypspzy2UXQHn6n?= =?us-ascii?Q?xTl/TP/ogUglxrM+z0Wh5nppSlnGVrvsj/EtZ/Is++P8oQBBtSLSffe0GOmM?= =?us-ascii?Q?vAdqPRMZ1veI9Czpzz9GA0RcmgHG8QYlABLtmpmiq/TTDNq9BBM2SLAjU7L9?= =?us-ascii?Q?lHGyGDQkIl/k2orlY8p0WyzMgcJ7MaFlrelGICQlhd2e7qVT+aLYakvKiLrG?= =?us-ascii?Q?f3vtUospARpr5bL7KgiIeCzVn/b6rEIGoWoYwahXHUfjEb9h1GgjcJVda/Qx?= =?us-ascii?Q?y06ZKFJQbLLhm3Jig0XfNyCNMvje7cVN4E9X/DzdJQ5eKuGdZ+NAdgEi6Awy?= =?us-ascii?Q?3jepVr2VIA9UTm16vTDous/WFiqHv4IsHZivnUB5moYKq6w3dW+P5YoXVr0U?= =?us-ascii?Q?rISJ5wf1tNmxZM7t+/D+dX5OUgzwIJT6wYFXHclvk+pZND53r1o1JFIHri1H?= =?us-ascii?Q?dYt4uUEiIwE6Akm7OaHoubNXM3uIrZiYxxO0ldQVPZ6AzEXgOOKCM5bQWeLX?= =?us-ascii?Q?qwAiHtFJGlpDrf6b/YXZAjNBCa5ywfTxVJ7W301/EE0AO+ZhOT9lsGrqX0Ww?= =?us-ascii?Q?Cb0Avi8WPPH8eKlmWcBhztlKWdsTyCGZ7ZBhRrOsQECTTnXp8kjCE+K+Et6u?= =?us-ascii?Q?0a5PzS5b4rPAPM13kA8bRUT+IGt79wOGNMFonKuQ2aLn/leuhtqiAuCUWUbQ?= =?us-ascii?Q?c5JU0wNFsAsy009PC0ujZTI8Aqmt1OPhHx6JuSHwVPQM+fnBDMhkIqEAVT9T?= =?us-ascii?Q?HmOpqU1od3++2pNI07TWTVgzmLzyy5Px4CCxfirOqlJvGyAwSApnfOxxI8Pc?= =?us-ascii?Q?0rNDJAibWWV4vh/bCjj82c96uycge3zE95mHqBdf0TcNkbcHiY1PQiySp+pW?= =?us-ascii?Q?L7JJL8QTbCqSp7PGJ5Bel2dw8a8fVlq2X8JaNuOsuUQ2smC5HTYG5tFzb6aD?= =?us-ascii?Q?S0aG0MheyLYiqO40SujRfBpfAY3cILwi58R0gtyfzcioUsUQFKFG3slkfDvm?= =?us-ascii?Q?bptUlbwn6pBrlIcjpPTTRmEupd7MBvHSqOe8YyL60CiXUOTitH0A6cI5gR8H?= =?us-ascii?Q?DJ0U//wqsZAMxTc2ZY67kbb8YFo0QWUvdrA6PImsQWYiX23QAVmwv6lvLb8b?= =?us-ascii?Q?V4gymLyMwtwdGkysbb3b6qWwSuZKaAF8LIVGWk2SxOVS+ZpzPQmq3VDp3bJc?= =?us-ascii?Q?UhIfxNOpzpaq0wpshNWm2A3tturhrMVE/twcGkOh?= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:22:28.7664 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30f584a2-4169-4163-0dd8-08de43972012 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS2PR12MB9751 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 23.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/25. 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://github.com/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/6b9525772e962e2d051c7dafa1abf60fcfa3c061 Thanks. Shani --- >From 6b9525772e962e2d051c7dafa1abf60fcfa3c061 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 27 Oct 2025 11:15:31 +0800 Subject: [PATCH] net/txgbe: add device arguments for FDIR [ upstream commit 7e18be9beef25ee60f9c04f757cb4361706ff818 ] Since FDIR configuration is deprecated in generic ethdev device configuration and move it into the device private data, there is no way to configure the FDIR parameters. Two device arguments "pkt-filter-size" and "pkt-filter-drop-queue" are added, they just continue to use the previous naming convention. Fixes: 5007ac13189d ("ethdev: remove deprecated Flow Director configuration") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index 3479639ec4..d39894c953 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -699,6 +699,8 @@ struct txgbe_phy_info { #define TXGBE_DEVARG_FFE_MAIN "ffe_main" #define TXGBE_DEVARG_FFE_PRE "ffe_pre" #define TXGBE_DEVARG_FFE_POST "ffe_post" +#define TXGBE_DEVARG_FDIR_PBALLOC "pkt-filter-size" +#define TXGBE_DEVARG_FDIR_DROP_QUEUE "pkt-filter-drop-queue" static const char * const txgbe_valid_arguments[] = { TXGBE_DEVARG_BP_AUTO, @@ -709,6 +711,8 @@ static const char * const txgbe_valid_arguments[] = { TXGBE_DEVARG_FFE_MAIN, TXGBE_DEVARG_FFE_PRE, TXGBE_DEVARG_FFE_POST, + TXGBE_DEVARG_FDIR_PBALLOC, + TXGBE_DEVARG_FDIR_DROP_QUEUE, NULL }; diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index f990fec7f1..22fb7fbdfd 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -497,8 +497,12 @@ txgbe_handle_devarg(__rte_unused const char *key, const char *value, } static void -txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) +txgbe_parse_devargs(struct rte_eth_dev *dev) { + struct rte_eth_fdir_conf *fdir_conf = TXGBE_DEV_FDIR_CONF(dev); + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); + struct rte_devargs *devargs = pci_dev->device.devargs; + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); struct rte_kvargs *kvlist; u16 auto_neg = 1; u16 poll = 0; @@ -508,6 +512,9 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) u16 ffe_main = 27; u16 ffe_pre = 8; u16 ffe_post = 44; + /* FDIR args */ + u8 pballoc = 0; + u8 drop_queue = 127; if (devargs == NULL) goto null; @@ -532,6 +539,10 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) &txgbe_handle_devarg, &ffe_pre); rte_kvargs_process(kvlist, TXGBE_DEVARG_FFE_POST, &txgbe_handle_devarg, &ffe_post); + rte_kvargs_process(kvlist, TXGBE_DEVARG_FDIR_PBALLOC, + &txgbe_handle_devarg, &pballoc); + rte_kvargs_process(kvlist, TXGBE_DEVARG_FDIR_DROP_QUEUE, + &txgbe_handle_devarg, &drop_queue); rte_kvargs_free(kvlist); null: @@ -543,6 +554,9 @@ null: hw->phy.ffe_main = ffe_main; hw->phy.ffe_pre = ffe_pre; hw->phy.ffe_post = ffe_post; + + fdir_conf->pballoc = pballoc; + fdir_conf->drop_queue = drop_queue; } static int @@ -630,7 +644,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) hw->isb_dma = TMZ_PADDR(mz); hw->isb_mem = TMZ_VADDR(mz); - txgbe_parse_devargs(hw, pci_dev->device.devargs); + txgbe_parse_devargs(eth_dev); /* Initialize the shared code (base driver) */ err = txgbe_init_shared_code(hw); if (err != 0) { @@ -5593,7 +5607,9 @@ RTE_PMD_REGISTER_PARAM_STRING(net_txgbe, TXGBE_DEVARG_FFE_SET "=<0-4>" TXGBE_DEVARG_FFE_MAIN "=" TXGBE_DEVARG_FFE_PRE "=" - TXGBE_DEVARG_FFE_POST "="); + TXGBE_DEVARG_FFE_POST "=" + TXGBE_DEVARG_FDIR_PBALLOC "=<0|1|2>" + TXGBE_DEVARG_FDIR_DROP_QUEUE "="); RTE_LOG_REGISTER_SUFFIX(txgbe_logtype_init, init, NOTICE); RTE_LOG_REGISTER_SUFFIX(txgbe_logtype_driver, driver, NOTICE); -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:38.106546202 +0200 +++ 0036-net-txgbe-add-device-arguments-for-FDIR.patch 2025-12-25 11:16:35.579991000 +0200 @@ -1 +1 @@ -From 7e18be9beef25ee60f9c04f757cb4361706ff818 Mon Sep 17 00:00:00 2001 +From 6b9525772e962e2d051c7dafa1abf60fcfa3c061 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e18be9beef25ee60f9c04f757cb4361706ff818 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19,2 +20,2 @@ - drivers/net/txgbe/txgbe_ethdev.c | 20 ++++++++++++++++++-- - 2 files changed, 22 insertions(+), 2 deletions(-) + drivers/net/txgbe/txgbe_ethdev.c | 22 +++++++++++++++++++--- + 2 files changed, 23 insertions(+), 3 deletions(-) @@ -23 +24 @@ -index 07b443c2e0..b5dbc9b755 100644 +index 3479639ec4..d39894c953 100644 @@ -26 +27 @@ -@@ -743,6 +743,8 @@ struct txgbe_phy_info { +@@ -699,6 +699,8 @@ struct txgbe_phy_info { @@ -32,4 +33,4 @@ - #define TXGBE_DEVARG_TX_HEAD_WB "tx_headwb" - #define TXGBE_DEVARG_TX_HEAD_WB_SIZE "tx_headwb_size" - #define TXGBE_DEVARG_RX_DESC_MERGE "rx_desc_merge" -@@ -756,6 +758,8 @@ static const char * const txgbe_valid_arguments[] = { + + static const char * const txgbe_valid_arguments[] = { + TXGBE_DEVARG_BP_AUTO, +@@ -709,6 +711,8 @@ static const char * const txgbe_valid_arguments[] = { @@ -41,3 +42,3 @@ - TXGBE_DEVARG_TX_HEAD_WB, - TXGBE_DEVARG_TX_HEAD_WB_SIZE, - TXGBE_DEVARG_RX_DESC_MERGE, + NULL + }; + @@ -45 +46 @@ -index cbb2ea815f..e9bbf8ea72 100644 +index f990fec7f1..22fb7fbdfd 100644 @@ -48 +49 @@ -@@ -524,8 +524,12 @@ txgbe_handle_devarg(__rte_unused const char *key, const char *value, +@@ -497,8 +497,12 @@ txgbe_handle_devarg(__rte_unused const char *key, const char *value, @@ -62 +63 @@ -@@ -535,6 +539,9 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) +@@ -508,6 +512,9 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) @@ -69,4 +70,4 @@ - /* New devargs for amberlite config */ - u16 tx_headwb = 1; - u16 tx_headwb_size = 16; -@@ -563,6 +570,10 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) + + if (devargs == NULL) + goto null; +@@ -532,6 +539,10 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs) @@ -80,4 +81,4 @@ - rte_kvargs_process(kvlist, TXGBE_DEVARG_TX_HEAD_WB, - &txgbe_handle_devarg, &tx_headwb); - rte_kvargs_process(kvlist, TXGBE_DEVARG_TX_HEAD_WB_SIZE, -@@ -583,6 +594,9 @@ null: + rte_kvargs_free(kvlist); + + null: +@@ -543,6 +554,9 @@ null: @@ -93 +94 @@ -@@ -671,7 +685,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) +@@ -630,7 +644,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) @@ -102 +103,2 @@ -@@ -6034,6 +6048,8 @@ RTE_PMD_REGISTER_PARAM_STRING(net_txgbe, +@@ -5593,7 +5607,9 @@ RTE_PMD_REGISTER_PARAM_STRING(net_txgbe, + TXGBE_DEVARG_FFE_SET "=<0-4>" @@ -105 +107,2 @@ - TXGBE_DEVARG_FFE_POST "=" +- TXGBE_DEVARG_FFE_POST "="); ++ TXGBE_DEVARG_FFE_POST "=" @@ -107,4 +110,4 @@ -+ TXGBE_DEVARG_FDIR_DROP_QUEUE "=" - TXGBE_DEVARG_TX_HEAD_WB "=<0|1>" - TXGBE_DEVARG_TX_HEAD_WB_SIZE "=<1|16>" - TXGBE_DEVARG_RX_DESC_MERGE "=<0|1>"); ++ TXGBE_DEVARG_FDIR_DROP_QUEUE "="); + + RTE_LOG_REGISTER_SUFFIX(txgbe_logtype_init, init, NOTICE); + RTE_LOG_REGISTER_SUFFIX(txgbe_logtype_driver, driver, NOTICE);