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 B9E5A470AE for ; Sun, 21 Dec 2025 16:01:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B35DA4042C; Sun, 21 Dec 2025 16:01:21 +0100 (CET) Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011037.outbound.protection.outlook.com [52.101.52.37]) by mails.dpdk.org (Postfix) with ESMTP id EE907402ED for ; Sun, 21 Dec 2025 16:01:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d+bTgKhmMDbK+RqQlG3chSGYlzQc2Ygw2H/UO8mJrd/NQgvyVl6sKI4Xl4VJgmebs1TC3qqCroAQC3BtKVJRijneL2MvkVGm2/k79JE+SD7+Py9klGncz4Ud+EyabsWp37t98D791DjbLNnEXajzfYTpNGMJWCcDcnzDHDhMuUMoO5C8G9zolz21iOEjFrGGYT+uWI/DQvFYPQUPE+ivqn6QYMdDZG1aVHMiorFTmOdNawyhZAWaHuMZ7VgqMxThrThQ39Wey11NjKaPFc4COsX7eT+SlgaN6vE7zYLTltBVuUgOHlJs0q09NiPCKR9lp62w6Pw3M7PwtVH3j0W1kg== 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=xcBz+tJPb8FnUwkl+Pv32nDL1VHT+GV/5O+3TTqM928=; b=Uc83H+sEwfNN44w6MNgPifikQkWg9GqFscbMuZAn0i8ZHK+96J5OphD697YGIdSaLvqch0pLnx5mAgLqVQcfre0At3qrNsaO3JEI6KnZK0KjrMVF83bZMjRcKRqwfqjs4+DIACBsGOw+Iux7Yn9a3TcRfEF0oHBdDJywk2r+vUCyxSCgd03gQiwJ1LUaak4uNs9uKN2K2KX71uLKA6+QgZ5cQwHZw8tgeTFkB0DECzzdTshmqrCLh8CuMiRMDUKrXFsR1m/OD65TFMX5pvTRkvXRd+jW2XLiFq6owqGbsI2Pqow3HkNqVQi1lsKkqC45wz2VStHn8j8IS2fU2IH2bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=xcBz+tJPb8FnUwkl+Pv32nDL1VHT+GV/5O+3TTqM928=; b=b9dbNYx269iCTh3QnzU4HxF8gQL6WSAp2QB9+5Mbk8S1QNQ80v7NpSC505PKb0gi+492jvZcw+AGqbvKtuxcAhI/dkS47+km5aPmJC9bdQDjVxdnPvcPplRYBATBAOLTscsIG1EqPyOt2WqJtTRTRMcCSGQghVaBzGCX6tqB5YsUhnUEOBy6nYjOm192NY/+23P+ZxH89lSoE7DVzeiEJ7uMD8VWfT9dTuBmEfTScz2Uk6fqStID51TUVOV+obN2mlAGou1WlD8+GP7+pZYeIHBHlrYP6FrGCy45g9XBUuCMBqO9b5U2LQXWrcGNYBrNiZB8S2jSYJsSH07dHr6ydw== Received: from SJ0PR05CA0010.namprd05.prod.outlook.com (2603:10b6:a03:33b::15) by CY5PR12MB6456.namprd12.prod.outlook.com (2603:10b6:930:34::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sun, 21 Dec 2025 15:01:15 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:a03:33b:cafe::fb) by SJ0PR05CA0010.outlook.office365.com (2603:10b6:a03:33b::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.5 via Frontend Transport; Sun, 21 Dec 2025 15:00:45 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Sun, 21 Dec 2025 15:01:15 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.2562.20; Sun, 21 Dec 2025 07:00:59 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) 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:00:58 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.6) 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:00:57 -0800 From: Shani Peretz To: Bruce Richardson CC: Ciara Loftus , dpdk stable Subject: patch 'net/intel: fix assumption about tag placement order' has been queued to stable release 23.11.6 Date: Sun, 21 Dec 2025 16:56:21 +0200 Message-ID: <20251221145746.763179-33-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: SJ5PEPF00000204:EE_|CY5PR12MB6456:EE_ X-MS-Office365-Filtering-Correlation-Id: e1d4bf80-6bd5-4519-ec76-08de40a1c9db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?T7J1IgHWtj9KimehRqwBb/c/rUC09BNzZbA40WBTTYp8gXAySKOOc8xSmhM8?= =?us-ascii?Q?R1q4m6jogPj2dFJEL4kQXeZa9osyZgKMlXdPqXPUZ/ewyUdPcKXEKNPMdVqJ?= =?us-ascii?Q?hoAmLX+4mNEyiaYj5sfhzq0cEWaNLkPlov5jfDvQeGFALypTejwItaPePKcS?= =?us-ascii?Q?0EaRsT6O6QdZyKJbIkt1OyEEoYkWp92mU8njI8WOdftElpUshKUc9SYNh4BW?= =?us-ascii?Q?7rGVk7dJZBt8/yErdnTV7U3K2B39aC57vBxxUzX/LdWJcyi3UnH1+Kt/wdH4?= =?us-ascii?Q?LCC3RpkX+eWGYj0+QzcnW7aBAHgvWSCeMSElcXxEML38ssGHusEckMc+65mW?= =?us-ascii?Q?AVi98/Qkz8mRtpJWVkC6icYtYjnDQp7adGHyEnnbmSO8BPtJaQL+ccnK8Hz0?= =?us-ascii?Q?uT3cXZuqI2aBmD8BauPknQegRLv5ua6u+eyjQuipUZqkdpgoPN+WcclE1aIM?= =?us-ascii?Q?U8BeMWHCGSZnzcFCfm9nrA3sSZZ10uzrkj+U1imA1sFH3VWjsNDiro3xlc0x?= =?us-ascii?Q?iIYl1IBvTh27uGmaVOax6kFNt6zH3xpDwNDyx7j6hOEPn17wHUchQZaMNJpg?= =?us-ascii?Q?rIN2yE/jI0taoa2D78/PZM4kGy0FEr+83gn2q0zum+B14F+uxoymPe6CHMmi?= =?us-ascii?Q?GYm5zIaQRzOLpuFo/bb+DoS3CymhzivW821z17VCwJiN/PeEKjQIFrfPzRo8?= =?us-ascii?Q?iDr1BhsilGntHg/hjVdxSq+uDegN07mPEpvJPXrIVoddBar5EX6MTc9d0WFI?= =?us-ascii?Q?iQoRLkSHMnCpR7vY47Zl0R7rs9/bIogEYhVNpk09KhLDjrIrNaqN+ulGjtPG?= =?us-ascii?Q?oyt5/sdi1JzUXn3Dgrh1iXMKHIUj9GVfgLxWUlR4th2RGZ6pQdM2ZPnAUSO2?= =?us-ascii?Q?y5/oaGUR1o51L+oKFKQlPQwyAOkRQzw7xpbc5EY18vMzGQDrXEXpAqVMFsua?= =?us-ascii?Q?HrcAQKHRBOwJ/CQKq6LsZS/2NhK+HE1zjKxsHGc2dFlHUG4djixYBlJHxduG?= =?us-ascii?Q?GiuQ1+P5o55Ecw9nVMWItOicAWMblF/CJ4T0IoYHmKxyEDxI4KHn4YUnmo6r?= =?us-ascii?Q?zEcHJ2EidpbTgr86lbvjNylp3MC9KCG0REzi+oNutmMX9axt6dfC1alZZcRA?= =?us-ascii?Q?2LCysoAmSw9y7CXnoawCiGolMRNrob7z7dVp9nMub8luje58OfkEce7LYDZk?= =?us-ascii?Q?cO+4AlLQmHXkdtMnXs6Bcy7f6IdOLBVdH8eOb+XRtwEwj8+RyXmwwSm9qHfi?= =?us-ascii?Q?SavM77iG2X9tqm3FXQM+h31ost29RJHinWfeX0CJlNkTkFKIguJOO5ffKbFr?= =?us-ascii?Q?snAoOGtz8wj7zfWHghINFjWXhXFNyM+t7i7W/2aXn8QNwdoemnQu3YWEfn0r?= =?us-ascii?Q?Iq58zMByD3+rCnw7bHTmmIk6OfKxtnmgSxMzbm3VfaU9si9YrnTnz9K0CS5J?= =?us-ascii?Q?q9y7+Z9SmBaU3VdDwD220T3dMo7kVkUsLFcBHTpGE6JRWa2cAlcnChkWdy5z?= =?us-ascii?Q?tDi+/TMudWS/G0pNfn3LDongUuY/hePNNo5KHXqjwI6I+cAxiLsUM/RrUQq7?= =?us-ascii?Q?qocAIMvtQHkhUZDRsHqMQJ/d/S+BXsbwrWu1bMff?= 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:(13230040)(82310400026)(376014)(1800799024)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2025 15:01:15.2324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1d4bf80-6bd5-4519-ec76-08de40a1c9db 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6456 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/da7ede080e148b05a6c3ba0dd6a30805557ffe22 Thanks. Shani --- >From da7ede080e148b05a6c3ba0dd6a30805557ffe22 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 18 Jul 2025 16:43:12 +0100 Subject: [PATCH] net/intel: fix assumption about tag placement order [ upstream commit 21168355589ea9edfcb2925f4952ecb05470f92f ] The specific placement of outer/inner VLAN tags in NIC descriptors is configurable. Therefore, remove the assumption that if the L2Tag2 field is filled in, that the L2Tag1 must also be. Instead, check the existing mbuf VLAN flags, and move tags and set flags as appropriate. This fixes an issue where, with QinQ packets with different Tag ethtypes (0x88a8 vs 0x8100), we get an mbuf reporting two valid tags, but only having had one tag stripped. Fixes: cc9d0456b870 ("i40e: support double vlan stripping and insertion") Fixes: 1e728b01120c ("net/iavf: rework Tx path") Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops") Signed-off-by: Bruce Richardson Acked-by: Ciara Loftus --- drivers/net/i40e/i40e_rxtx.c | 10 +++++++--- drivers/net/iavf/iavf_rxtx.c | 12 +++++++----- drivers/net/ice/ice_rxtx.c | 10 +++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 4dafc23bc1..338d6304c5 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -128,9 +128,13 @@ i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union i40e_rx_desc *rxdp) #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC if (rte_le_to_cpu_16(rxdp->wb.qword2.ext_status) & (1 << I40E_RX_DESC_EXT_STATUS_L2TAG2P_SHIFT)) { - mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | RTE_MBUF_F_RX_QINQ | - RTE_MBUF_F_RX_VLAN_STRIPPED | RTE_MBUF_F_RX_VLAN; - mb->vlan_tci_outer = mb->vlan_tci; + if ((mb->ol_flags & RTE_MBUF_F_RX_VLAN_STRIPPED) == 0) { + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } else { + /* if two tags, move Tag1 to outer tag field */ + mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | RTE_MBUF_F_RX_QINQ; + mb->vlan_tci_outer = mb->vlan_tci; + } mb->vlan_tci = rte_le_to_cpu_16(rxdp->wb.qword2.l2tag2_2); PMD_RX_LOG(DEBUG, "Descriptor l2tag2_1: %u, l2tag2_2: %u", rte_le_to_cpu_16(rxdp->wb.qword2.l2tag2_1), diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 9237f65936..73418f2830 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -1200,11 +1200,13 @@ iavf_flex_rxd_to_vlan_tci(struct rte_mbuf *mb, #ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC if (rte_le_to_cpu_16(rxdp->wb.status_error1) & (1 << IAVF_RX_FLEX_DESC_STATUS1_L2TAG2P_S)) { - mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | - RTE_MBUF_F_RX_QINQ | - RTE_MBUF_F_RX_VLAN_STRIPPED | - RTE_MBUF_F_RX_VLAN; - mb->vlan_tci_outer = mb->vlan_tci; + if ((mb->ol_flags & RTE_MBUF_F_RX_VLAN_STRIPPED) == 0) { + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } else { + /* if two tags, move Tag1 to outer tag field */ + mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | RTE_MBUF_F_RX_QINQ; + mb->vlan_tci_outer = mb->vlan_tci; + } mb->vlan_tci = rte_le_to_cpu_16(rxdp->wb.l2tag2_2nd); PMD_RX_LOG(DEBUG, "Descriptor l2tag2_1: %u, l2tag2_2: %u", rte_le_to_cpu_16(rxdp->wb.l2tag2_1st), diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 6af16f9aed..9c7d82b8f4 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1659,9 +1659,13 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (rte_le_to_cpu_16(rxdp->wb.status_error1) & (1 << ICE_RX_FLEX_DESC_STATUS1_L2TAG2P_S)) { - mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | RTE_MBUF_F_RX_QINQ | - RTE_MBUF_F_RX_VLAN_STRIPPED | RTE_MBUF_F_RX_VLAN; - mb->vlan_tci_outer = mb->vlan_tci; + if ((mb->ol_flags & RTE_MBUF_F_RX_VLAN_STRIPPED) == 0) { + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } else { + /* if two tags, move Tag1 to outer tag field */ + mb->ol_flags |= RTE_MBUF_F_RX_QINQ_STRIPPED | RTE_MBUF_F_RX_QINQ; + mb->vlan_tci_outer = mb->vlan_tci; + } mb->vlan_tci = rte_le_to_cpu_16(rxdp->wb.l2tag2_2nd); PMD_RX_LOG(DEBUG, "Descriptor l2tag2_1: %u, l2tag2_2: %u", rte_le_to_cpu_16(rxdp->wb.l2tag2_1st), -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-21 16:54:19.039875124 +0200 +++ 0033-net-intel-fix-assumption-about-tag-placement-order.patch 2025-12-21 16:54:16.959044000 +0200 @@ -1 +1 @@ -From 21168355589ea9edfcb2925f4952ecb05470f92f Mon Sep 17 00:00:00 2001 +From da7ede080e148b05a6c3ba0dd6a30805557ffe22 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 21168355589ea9edfcb2925f4952ecb05470f92f ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -22,3 +23,3 @@ - drivers/net/intel/i40e/i40e_rxtx.c | 10 +++++++--- - drivers/net/intel/iavf/iavf_rxtx.c | 12 +++++++----- - drivers/net/intel/ice/ice_rxtx.c | 10 +++++++--- + drivers/net/i40e/i40e_rxtx.c | 10 +++++++--- + drivers/net/iavf/iavf_rxtx.c | 12 +++++++----- + drivers/net/ice/ice_rxtx.c | 10 +++++++--- @@ -27,6 +28,6 @@ -diff --git a/drivers/net/intel/i40e/i40e_rxtx.c b/drivers/net/intel/i40e/i40e_rxtx.c -index b149a4c127..50b74149e3 100644 ---- a/drivers/net/intel/i40e/i40e_rxtx.c -+++ b/drivers/net/intel/i40e/i40e_rxtx.c -@@ -128,9 +128,13 @@ i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ci_rx_desc *rxdp) - #ifndef RTE_NET_INTEL_USE_16BYTE_DESC +diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c +index 4dafc23bc1..338d6304c5 100644 +--- a/drivers/net/i40e/i40e_rxtx.c ++++ b/drivers/net/i40e/i40e_rxtx.c +@@ -128,9 +128,13 @@ i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union i40e_rx_desc *rxdp) + #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC @@ -48,6 +49,6 @@ -diff --git a/drivers/net/intel/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c -index 50adc7ea1a..982e16f929 100644 ---- a/drivers/net/intel/iavf/iavf_rxtx.c -+++ b/drivers/net/intel/iavf/iavf_rxtx.c -@@ -1184,11 +1184,13 @@ iavf_flex_rxd_to_vlan_tci(struct rte_mbuf *mb, - +diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c +index 9237f65936..73418f2830 100644 +--- a/drivers/net/iavf/iavf_rxtx.c ++++ b/drivers/net/iavf/iavf_rxtx.c +@@ -1200,11 +1200,13 @@ iavf_flex_rxd_to_vlan_tci(struct rte_mbuf *mb, + #ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC @@ -71,6 +72,6 @@ -diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c -index 5e72c231f7..aa8b838955 100644 ---- a/drivers/net/intel/ice/ice_rxtx.c -+++ b/drivers/net/intel/ice/ice_rxtx.c -@@ -1835,9 +1835,13 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ci_rx_flex_desc *rxdp) - #ifndef RTE_NET_INTEL_USE_16BYTE_DESC +diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c +index 6af16f9aed..9c7d82b8f4 100644 +--- a/drivers/net/ice/ice_rxtx.c ++++ b/drivers/net/ice/ice_rxtx.c +@@ -1659,9 +1659,13 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) + #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC