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 20664470AE for ; Sun, 21 Dec 2025 16:03:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A7D640615; Sun, 21 Dec 2025 16:03:33 +0100 (CET) Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012010.outbound.protection.outlook.com [40.93.195.10]) by mails.dpdk.org (Postfix) with ESMTP id 0F31940611 for ; Sun, 21 Dec 2025 16:03:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JKOFQUGhDdwxIUS4cDboZ2lrphl0SI7GkbFeAnzvfEEYZ1FKCBjZGfseyN8dzs22BdelsiP08l2DeY7XN1Aizg3HuyZmvIFQPpJCuRUPvAMXgrqgDnm/a0XqxMUlLqhRDyJtOwadzzw2lrRAm0Jghhoacez19WSgvmt9PIH+9rmdXLUoAhF//sgaF/N2cfG1ch+icbWF2UB1jRWN4FLcGMHukBzuFXrwOf9ojvI01T/7zd4Fu8mib/BL2Qh/pY6F/G2RQk8HCTYv4xh+2yrrjb0iQeFeGzhrvLTzG4Q9dE9WtX6dlJ7dNCuxQ/+f6sboSnMyEToY1Nu3bqZcneJYwA== 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=5Ehb59aQhPUSyw+5SY79KVXEh8Dc7Get5hEADA4tFDA=; b=Vv9pS4ZXysL+UM+MsTyHJa0PcDRj9MjLjaqMNdr1tdFRtr6P6TTmaoLMaswWxJArLnnkaELJlJe57K390bQomwxocoSlpb4g6yY3gYoT5zjq5tW55cSHexn9v9/iUqnnuhwhIuo1JcjNSwrT3Adbcj8WeKtVXn3xbNYC2OItCJaEJ4Ld0f3Ai/YOXjZ3Ux8LAz73D8cJOgnumZVlBamZuNn5nRM9jjHFjLLow+k+1kNVyTmqQGqMwiQWBMNWW46nM7+UoehQY6rw8J3IdNUYdBuLiTpxaZZ9bXZatpX7OJCkDsgGG2JHRH5KKJXmpy7xK9+CYvrbv7zWye5NQfubcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=intel.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=5Ehb59aQhPUSyw+5SY79KVXEh8Dc7Get5hEADA4tFDA=; b=e+2DJjzJzmnEk9rbFfmxPSb+ZJPJPgB/TPYOGgg1GjOyGpIPZvg+lnINY5QXmXH4JIuAX/plhXoDg/IH6yYPLKWkN4YIFAcp/0hAd8hRBQzVD4ibxwRs8CKN8s86RuX183MWOc4EDBr2MM/UGoH65c/jvemj7LXlgdlbK7WeTDa8jBsQNoUeR7g59dEZEcM/jk0wKm24OX7J41BMlFVI6zFdGfeca7cDYsbvAjoBhXOnR8HWYpPZ9VAIk4bcVGAbbfFOxNWq1S6tAus6ySdtY5okGo4GKidOoQDHooPpc6I7JsgLRUz/hUMieD7PgpRHHuikNvNuPaxzErxKhavPgw== Received: from DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) by DS4PR12MB999100.namprd12.prod.outlook.com (2603:10b6:8:2f9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.11; Sun, 21 Dec 2025 15:03:24 +0000 Received: from CY4PEPF0000E9D6.namprd05.prod.outlook.com (2603:10b6:8:57:cafe::31) by DS7PR05CA0067.outlook.office365.com (2603:10b6:8:57::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.10 via Frontend Transport; Sun, 21 Dec 2025 15:03:21 +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 CY4PEPF0000E9D6.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Sun, 21 Dec 2025 15:03:24 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Sun, 21 Dec 2025 07:03:03 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.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; Sun, 21 Dec 2025 07:03:03 -0800 Received: from nvidia.com (10.127.8.12) by mail.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 via Frontend Transport; Sun, 21 Dec 2025 07:03:02 -0800 From: Shani Peretz To: Anatoly Burakov CC: Bruce Richardson , dpdk stable Subject: patch 'net/ice: remove indirection for FDIR filters' has been queued to stable release 23.11.6 Date: Sun, 21 Dec 2025 16:56:52 +0200 Message-ID: <20251221145746.763179-64-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251221145746.763179-1-shperetz@nvidia.com> References: <20251221145746.763179-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: CY4PEPF0000E9D6:EE_|DS4PR12MB999100:EE_ X-MS-Office365-Filtering-Correlation-Id: de446c0e-bd64-42d3-9347-08de40a216ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9VkMnhjAj5qIagn1MP2ctDSarkSS9OEo+jh59sg/48UB66DHGxsUUg1P2aF0?= =?us-ascii?Q?cQIMODrZIp8WNstKKuo1dYzNmIHkqoGgkgdrf/VB9rYaRxh1sqxEY3BTTEt+?= =?us-ascii?Q?iDh0DWZY33zeebUk2kNhRT8Og6UhH4Fs4Oz6uOHPVs+6yYJLqDLGvvvhFd9N?= =?us-ascii?Q?NNs45gVGExqidaTNofNoOb8/26qRzSeU0dKvHyz0SpWBT+msoi1B9utaK7+S?= =?us-ascii?Q?ntsaY/lz03j2FjKnCOXNWGul4R9WMfz8+EeNfyK8OLqSLR3oyb88YbuMgT0Y?= =?us-ascii?Q?uAlXm4uZRAlMd5MnLePreQTJcFWJ7LatdO9eYheQaM4PTmvKT0jOn/AwyT7W?= =?us-ascii?Q?glnVRHaG9GfMapmn0+Uu5xmPVtAsuHuZ/qJXCqKXoGb6vZaI4N/370I+RxE4?= =?us-ascii?Q?4ET1Cpf8HbWn80WpmhM6SN2eoGyX4pbisqVCru3s254Ztfeo9e5U8U7v+yAR?= =?us-ascii?Q?GNaY/fJizcwG11U5OMvR6gNmxM1WmDdNuEfwAodSWsjsMwLIWL6yMlNwxRak?= =?us-ascii?Q?94CH6epYfBmZrZzLKHudbro7eBk8TcBzj01USSwqIOg43E8RKrc4yl/ut2YX?= =?us-ascii?Q?HiTa1i0QoeeBszQx55JTEW54duL/qc9Z0T7O3o9//dxQB/KYyfMP+Qql11Gc?= =?us-ascii?Q?BaETB06iyw81SSAgE/AQe5T914PSbgt74Lijhh8xo7JvB22ZQAxbVafpu9X6?= =?us-ascii?Q?uqjGlE4fowx1D12tNsKgV2fBVL8wQTlympbt1ER9TW+ACXGtw3Mgw0DTG+NR?= =?us-ascii?Q?vXZvYdk6UOpM0Stv83FvJHFXIbyD8Ks0YKCkHJ2p5V4jJGJIZOHHlfFrk3PS?= =?us-ascii?Q?4+RAd8u//VzpUBzGrDql/seRZd7LmgGWxKcATw7r2zY5VGJs3hhmPYmSJ/8R?= =?us-ascii?Q?5hP/hWjjnyAphwqqy2c5WL1hqQeapmaHRYkDLYnRVxJN+uKiWr0+w/plMKKi?= =?us-ascii?Q?u8uDWiLYo7rtX22lbL9sxtRXGDnR08CyFu5YZsDHXnGESb5yYyv1xLYD/nuQ?= =?us-ascii?Q?91Vz5K546xDI1UPJ8o5hpaMqsFHimJequpitK5HYBKRQnXVa3Ct03u28MYsx?= =?us-ascii?Q?toKQM2eOpuUhxkvIx2F/Sjdot+6NA8GeMIDgHFqobQfksSPSkZFTrZjc0sZ/?= =?us-ascii?Q?Q0oe+GVk/lmjQcpEtiyatHfsa6l0ie3D5T3EKuxmtPud4Zsvl6rARq3qxqse?= =?us-ascii?Q?LmOTm7FnxdgfFhgdEb4ko2bFrJfHhZHqa+bggWlWXQFKQfqguCVtT45lPFQT?= =?us-ascii?Q?Je6SpAVdInCGUvViXp4+KOYqyFAnY+P4re4kYumNkAiPQvZAeUZb61G7acru?= =?us-ascii?Q?mDO9OUAoTnZzAnlOaqKP0LsqOnfl9Zsyr5CYg2VYO6VjX34r2x9HOUYgYBmD?= =?us-ascii?Q?sEpDf2Ic8ZzMfB5CYjVRnP213P9hWIWvclcl/PV/IyTMir/EYAunuNPMR1Ch?= =?us-ascii?Q?dlC5bEzEsw+ChIryWz9r3qNPVr9xVHh5XDLfwTOVr00TjGMcTS4ta1bs5Hw+?= =?us-ascii?Q?Gxku0kjg/CrWGwLXqUUl0EUQOB4GMod82omDzlrEMleqe2mT8Z7lRxVPaqbg?= =?us-ascii?Q?Wxx4gpH0b0kAj7KYOovVmbOKg6RCcVdDaajT7Vo8?= 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)(36860700013)(376014)(82310400026)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2025 15:03:24.5843 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de446c0e-bd64-42d3-9347-08de40a216ee 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: CY4PEPF0000E9D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB999100 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/26/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/dd4ef3ace4b67da74defa75eade23cb62f0c5996 Thanks. Shani --- >From dd4ef3ace4b67da74defa75eade23cb62f0c5996 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 10 Oct 2025 14:13:19 +0100 Subject: [PATCH] net/ice: remove indirection for FDIR filters [ upstream commit f1dd6c3fdf974810e9a0d57920a4aa66fa16342e ] Currently, when filters are created for FDIR, they are allocated dynamically using `ice_malloc()`. Not only this is inconsistent with hash filter code paths (hash uses embedded structures), this is also creating unnecessary indirection and complexity, and creates a memory leak where, if something fails during raw pattern parse, the profile memory isn't deallocated. Since there is no actual reason for why FDIR filter profile must use indirection, instead of fixing the memory leak just avoid it altogether by making the filter profile an embedded struct. When parsing begins, the entire scratch filter structure is zeroed out anyway, so there is no need to add any additional zero-initialization code. Fixes: 25be39cc1760 ("net/ice: enable protocol agnostic flow offloading in FDIR") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ice/ice_ethdev.h | 2 +- drivers/net/ice/ice_fdir_filter.c | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index d607f028e0..b7086c590a 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -345,7 +345,7 @@ struct ice_fdir_filter_conf { uint64_t input_set_i; /* only for tunnel inner fields */ uint32_t mark_flag; - struct ice_parser_profile *prof; + struct ice_parser_profile prof; bool parser_ena; u8 *pkt_buf; u8 pkt_len; diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 0d7b3fe164..2320d49d4f 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -1307,7 +1307,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, if (filter->parser_ena) { struct ice_hw *hw = ICE_PF_TO_HW(pf); - int id = ice_find_first_bit(filter->prof->ptypes, UINT16_MAX); + int id = ice_find_first_bit(filter->prof.ptypes, UINT16_MAX); int ptg = hw->blk[ICE_BLK_FD].xlt1.t[id]; u16 ctrl_vsi = pf->fdir.fdir_vsi->idx; u16 main_vsi = pf->main_vsi->idx; @@ -1317,11 +1317,11 @@ ice_fdir_create_filter(struct ice_adapter *ad, if (pi->fdir_actived_cnt != 0) { for (i = 0; i < ICE_MAX_FV_WORDS; i++) if (pi->prof.fv[i].proto_id != - filter->prof->fv[i].proto_id || + filter->prof.fv[i].proto_id || pi->prof.fv[i].offset != - filter->prof->fv[i].offset || + filter->prof.fv[i].offset || pi->prof.fv[i].msk != - filter->prof->fv[i].msk) + filter->prof.fv[i].msk) break; if (i == ICE_MAX_FV_WORDS) { fv_found = true; @@ -1331,7 +1331,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, if (!fv_found) { ret = ice_flow_set_hw_prof(hw, main_vsi, ctrl_vsi, - filter->prof, ICE_BLK_FD); + &filter->prof, ICE_BLK_FD); if (ret) goto error; } @@ -1341,12 +1341,12 @@ ice_fdir_create_filter(struct ice_adapter *ad, goto error; if (!fv_found) { - for (i = 0; i < filter->prof->fv_num; i++) { + for (i = 0; i < filter->prof.fv_num; i++) { pi->prof.fv[i].proto_id = - filter->prof->fv[i].proto_id; + filter->prof.fv[i].proto_id; pi->prof.fv[i].offset = - filter->prof->fv[i].offset; - pi->prof.fv[i].msk = filter->prof->fv[i].msk; + filter->prof.fv[i].offset; + pi->prof.fv[i].msk = filter->prof.fv[i].msk; } pi->fdir_actived_cnt = 1; } @@ -1444,7 +1444,6 @@ free_entry: return -rte_errno; error: - rte_free(filter->prof); rte_free(filter->pkt_buf); return -rte_errno; } @@ -1466,7 +1465,7 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, if (filter->parser_ena) { struct ice_hw *hw = ICE_PF_TO_HW(pf); - int id = ice_find_first_bit(filter->prof->ptypes, UINT16_MAX); + int id = ice_find_first_bit(filter->prof.ptypes, UINT16_MAX); int ptg = hw->blk[ICE_BLK_FD].xlt1.t[id]; u16 ctrl_vsi = pf->fdir.fdir_vsi->idx; u16 main_vsi = pf->main_vsi->idx; @@ -1494,7 +1493,6 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, flow->rule = NULL; - rte_free(filter->prof); rte_free(filter->pkt_buf); rte_free(filter); @@ -1921,13 +1919,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, if (!tmp_mask) return -rte_errno; - filter->prof = (struct ice_parser_profile *) - ice_malloc(&ad->hw, sizeof(*filter->prof)); - if (!filter->prof) - return -ENOMEM; - if (ice_parser_profile_init(&rslt, tmp_spec, tmp_mask, - pkt_len, ICE_BLK_FD, true, filter->prof)) + pkt_len, ICE_BLK_FD, true, &filter->prof)) return -rte_errno; u8 *pkt_buf = (u8 *)ice_malloc(&ad->hw, pkt_len + 1); @@ -2483,7 +2476,6 @@ ice_fdir_parse(struct ice_adapter *ad, rte_free(item); return ret; error: - rte_free(filter->prof); rte_free(filter->pkt_buf); rte_free(item); return ret; -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-21 16:54:20.430710428 +0200 +++ 0064-net-ice-remove-indirection-for-FDIR-filters.patch 2025-12-21 16:54:17.187035000 +0200 @@ -1 +1 @@ -From f1dd6c3fdf974810e9a0d57920a4aa66fa16342e Mon Sep 17 00:00:00 2001 +From dd4ef3ace4b67da74defa75eade23cb62f0c5996 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f1dd6c3fdf974810e9a0d57920a4aa66fa16342e ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -25,2 +26,2 @@ - drivers/net/intel/ice/ice_ethdev.h | 2 +- - drivers/net/intel/ice/ice_fdir_filter.c | 30 +++++++++---------------- + drivers/net/ice/ice_ethdev.h | 2 +- + drivers/net/ice/ice_fdir_filter.c | 30 +++++++++++------------------- @@ -29,5 +30,5 @@ -diff --git a/drivers/net/intel/ice/ice_ethdev.h b/drivers/net/intel/ice/ice_ethdev.h -index a0d2082206..6478d6dfbd 100644 ---- a/drivers/net/intel/ice/ice_ethdev.h -+++ b/drivers/net/intel/ice/ice_ethdev.h -@@ -379,7 +379,7 @@ struct ice_fdir_filter_conf { +diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h +index d607f028e0..b7086c590a 100644 +--- a/drivers/net/ice/ice_ethdev.h ++++ b/drivers/net/ice/ice_ethdev.h +@@ -345,7 +345,7 @@ struct ice_fdir_filter_conf { @@ -42,5 +43,5 @@ -diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c -index d41d223d52..d593624792 100644 ---- a/drivers/net/intel/ice/ice_fdir_filter.c -+++ b/drivers/net/intel/ice/ice_fdir_filter.c -@@ -1314,7 +1314,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, +diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c +index 0d7b3fe164..2320d49d4f 100644 +--- a/drivers/net/ice/ice_fdir_filter.c ++++ b/drivers/net/ice/ice_fdir_filter.c +@@ -1307,7 +1307,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, @@ -55 +56 @@ -@@ -1324,11 +1324,11 @@ ice_fdir_create_filter(struct ice_adapter *ad, +@@ -1317,11 +1317,11 @@ ice_fdir_create_filter(struct ice_adapter *ad, @@ -70 +71 @@ -@@ -1338,7 +1338,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, +@@ -1331,7 +1331,7 @@ ice_fdir_create_filter(struct ice_adapter *ad, @@ -79 +80 @@ -@@ -1348,12 +1348,12 @@ ice_fdir_create_filter(struct ice_adapter *ad, +@@ -1341,12 +1341,12 @@ ice_fdir_create_filter(struct ice_adapter *ad, @@ -96 +97 @@ -@@ -1451,7 +1451,6 @@ free_entry: +@@ -1444,7 +1444,6 @@ free_entry: @@ -104 +105 @@ -@@ -1473,7 +1472,7 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, +@@ -1466,7 +1465,7 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, @@ -113 +114 @@ -@@ -1501,7 +1500,6 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, +@@ -1494,7 +1493,6 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, @@ -121 +122 @@ -@@ -1928,13 +1926,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, +@@ -1921,13 +1919,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, @@ -136 +137 @@ -@@ -2495,7 +2488,6 @@ ice_fdir_parse(struct ice_adapter *ad, +@@ -2483,7 +2476,6 @@ ice_fdir_parse(struct ice_adapter *ad,