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 89CC046C54 for ; Wed, 30 Jul 2025 17:04:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82743402C3; Wed, 30 Jul 2025 17:04:00 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by mails.dpdk.org (Postfix) with ESMTP id 14640402C3 for ; Wed, 30 Jul 2025 17:03:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1753887839; x=1785423839; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=9n0ACYxA3EIJU2QbHZul8zLfCsskqqGWT9c9P37DZD4=; b=HAYeUjJksX8pNbRGqCoRwtzuhdxq/pPl6lKGWmpOPKtGJEb5d+JXER4a 9ZRp++mZtg1Rp5gwtpz08VkSeoshzJKy7XCrA0Rb0aybmv0jyFHlwMclP l9JXuLEeMzZSOOhXKbXF6BAVMzbgITjOcvchLOofUQl6FzDi0ht7QjcJy a5hanDUbRyWZpO4NlHJpGgWusMjLr0cnBTyduoYu8Gl+au24JbRZX70bN mEH3mZvvKVrpdIWHy5ge3h81EDPWNEOz9brBWhmb8aFIP+/IFhc6Xs1iA oPIZCraDlhSE7/9eDZ+LTe9xlLmDO7SXBdBwOfflhm6EXFRWpTaDebjpV Q==; X-CSE-ConnectionGUID: HtXCjDcETZCaFJpFdm5vGA== X-CSE-MsgGUID: yB1HfBsZRwC6bYD0xlQ2fQ== X-IronPort-AV: E=McAfee;i="6800,10657,11507"; a="60008141" X-IronPort-AV: E=Sophos;i="6.16,350,1744095600"; d="scan'208";a="60008141" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2025 08:03:58 -0700 X-CSE-ConnectionGUID: wcjy2WmYSqmXn8DbztB8UQ== X-CSE-MsgGUID: qO9ks7RcTnS78VeuwpKi+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,350,1744095600"; d="scan'208";a="162272125" Received: from orsmsx902.amr.corp.intel.com ([10.22.229.24]) by orviesa010.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2025 08:03:58 -0700 Received: from ORSMSX902.amr.corp.intel.com (10.22.229.24) by ORSMSX902.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.26; Wed, 30 Jul 2025 08:03:57 -0700 Received: from ORSEDG901.ED.cps.intel.com (10.7.248.11) by ORSMSX902.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.26 via Frontend Transport; Wed, 30 Jul 2025 08:03:57 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (40.107.212.48) by edgegateway.intel.com (134.134.137.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.26; Wed, 30 Jul 2025 08:03:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XqelypsmYQN5AQ4323MLZU8nvoYYhet834OZ687xCwVURH1mn320KAzEJqbHVru3Thh+ClmInhtUH4m2wxszCTYyS4aru4pX7+FVxyTmwdROu8QWmtIEURp+8pshskvbL9mWh0KjCAjBn4xhh3OH1YxObv0BgfRaDMHXHANeGWyJ7mVF/ea1LyTJ7NZPl44DfkeY4gY2pXyrLtLa0d8qttnsgc0VSeL80HNuuFlAGrZ/G1CYRarIMEN3z9kFX7UJgzkgL2Nt/CnKjXKdr5HwqLQn1f63y5GgAd/+Kjt9d1DhetQsEZVPfn9LWZ84YTPJEF5NRt/zYj46ni/SAopruw== 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=SpwrI9ptJSG50x7XRAhvDCHWVGQHX/lAdhwo73r1m3E=; b=desnX6uTY9Z52aakNVWrnmeTuKrTqtkJyaTreu70/y7ibtHZQq+l7tmNDjZg6MwaKQQSg+NGx/hWyCQKoonIGGM1topMtNjzAGgKPmQFPfvQN9qyqFU/QFz9NUxAaLMSf27vS5Kt1B5gLZng2GHb1exeoDdwNS0NWPlYKJr5U/HlEpi1cDmXmk6fB4OEN9S/bhSbYuz89vGR0NWm2TVbLm8Dr6aE97h16ml6B+PFY1cnrw7sufSHIdbUp6nb64VR+Z8Re3HTFXaOnoADweKglBYavHcBnHgMYfLD/Q27VUbNkOdGSi5tULnga5f4eYf4a+YPSJC6wT5TY4n501uHMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DS0PR11MB7309.namprd11.prod.outlook.com (2603:10b6:8:13e::17) by LV8PR11MB8722.namprd11.prod.outlook.com (2603:10b6:408:207::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.26; Wed, 30 Jul 2025 15:03:37 +0000 Received: from DS0PR11MB7309.namprd11.prod.outlook.com ([fe80::f120:cc1f:d78d:ae9b]) by DS0PR11MB7309.namprd11.prod.outlook.com ([fe80::f120:cc1f:d78d:ae9b%5]) with mapi id 15.20.8964.025; Wed, 30 Jul 2025 15:03:36 +0000 From: "Richardson, Bruce" To: Xueming Li CC: "Burakov, Anatoly" , dpdk stable Subject: RE: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement' has been queued to stable release 23.11.5 Thread-Topic: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement' has been queued to stable release 23.11.5 Thread-Index: AQHcAWL73Jh1KYgB40Kf1bDO8yDnJrRKw06A Date: Wed, 30 Jul 2025 15:03:36 +0000 Message-ID: References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> <20250730145633.245984-19-xuemingl@nvidia.com> In-Reply-To: <20250730145633.245984-19-xuemingl@nvidia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DS0PR11MB7309:EE_|LV8PR11MB8722:EE_ x-ms-office365-filtering-correlation-id: 806d658a-9da2-4add-dd09-08ddcf7a42a2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|1800799024|376014|38070700018; x-microsoft-antispam-message-info: =?us-ascii?Q?djNyNpTw9HuBQL5p3qzLlHf6KXoODIIYgaYt/n/NS3QobQPMtoTcEyuXZuvg?= =?us-ascii?Q?fBx6V0a1q1NBXLarw9HpvC1iwgKpk477pxT6rcRc5GgWtUMgcS6NvToqKjGS?= =?us-ascii?Q?5tiotryEZL0rxYwAtnoERcaGqMWzLep+B/cylndl3jd4WM0FS9MtKGQhDmPz?= =?us-ascii?Q?KcLNseT/LeQAmVxl15D1pRZP8fJHAB/FYp3kD8VAifI2jLrb7AAHl2j5MN12?= =?us-ascii?Q?yNfomeevBysTAs4nlDZGbQDeDm62cmOOxrmfTZs68C6vX+ZKmKu2wEoma5yq?= =?us-ascii?Q?yEsVCmgzg/AwHT2dIyRBbXmd0jKNWkufVs6jcc7CxjRf784StOlKZGcMOia0?= =?us-ascii?Q?MIHuQT2TrW74+U70xWnD2uFIMiDvYNTGvB5I8VhdmR1AcTV4RG6FvYHj8Te6?= =?us-ascii?Q?LXUADZ9v8eiuuONnz2sl+Y3PYczrpb/3S7KfhxrnSb7wsLh4pjmJYfZjWgfe?= =?us-ascii?Q?JUgoZS7ISjVcXy91c2zTSHQojP9nZdOHJ3BbMuzDex8KgLkufk+Z3sPnSHlX?= =?us-ascii?Q?IsgkjeVEf35CkAEZrPzws+KL5PErtOsvTwQY9AzJrTlbnOGdh6CEVKyx/9A7?= =?us-ascii?Q?atZrHsFizPOqSZ8s+B5rcCSnAhY9GZr86FgQDqV75lOl73onhrQ+zQ9NRsrY?= =?us-ascii?Q?5jTDHR9yqjj/nhxres+V2o2hlpU8I4K46TtYyC1WhkzBjH7+YwVFkS+3P5gS?= =?us-ascii?Q?0Og6uzogR57cd1dWwdLlcXpGTG42JliLetzWNZWxGseR9xuLkjp3a8C4dbt3?= =?us-ascii?Q?RieEAcHXE9GKhs82bhYtv1dgO6PRLHGepl17pUid/VvqNUHTt7pdxQRMYW1O?= =?us-ascii?Q?UtGmSrzdLgKsi9wXpBuUVExWtb2jTl9+qgyRfBRyJkmnMqEkOEJV5CmGmBmb?= =?us-ascii?Q?LaICaNzHvolMksuHCxOQ3t3cX83CSq2E+OmhRU12CfoDNMH188CnkLD5T5Ii?= =?us-ascii?Q?m4mjKhw1QM647WjKjdf4Xcd4KInaaklqDZCaIPvB4yHTG9LVaUdYEEixfgsd?= =?us-ascii?Q?kjONKqZCj+KECR3yRbBwOXbOfizmh4BFmu9zVNGhvbGvte8ZLUGuQYNvzIaN?= =?us-ascii?Q?Izct0qMXdZCOAG/YZ2skliVynAkeCwdVKfx8QBB+1KFGM3IqT1g7wGYUzm/Z?= =?us-ascii?Q?24o5Dnzqrr5u4L2vfSLmSoQYoDclF+ahgwLYemrEwAK8WY1nPeKSt5ZsAKsv?= =?us-ascii?Q?RkCsecK5g8ZBjzI7Wvz4vjNQc9x2fRp7J8qnFaymYmYBs6VnAc3jKrnaaqKE?= =?us-ascii?Q?k6gpKHsMo779DzO5J3OtExpuxr0U0+txY+P3k5+BcB80Jc0VDjXO5g10KgdI?= =?us-ascii?Q?Kkdni2HVNFWSm2DRkA2WDumvk5SuPolIMfhZqQRwbCUx2nqJSqxuxAy4JbEX?= =?us-ascii?Q?3xxFn5zkJi+5jpXNqubkZizst4GNXO2K9GPnxidL76O4fOsND1EkPoidja4c?= =?us-ascii?Q?TYwfNxaXTNtEjZ7joGZyLqVLOnBzQYkjKrL9mk0jkIxhpWajGax7HsOjFSDi?= =?us-ascii?Q?aoX6jXiTIBUQra4=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR11MB7309.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?d3s6khR9bMA/Db9Yq06XdgqLXdj9ylAuk+pKqiD5sjaWC+fUysSMHciHHDnN?= =?us-ascii?Q?FFwmrDK16CUmCrKy954cgFRRhBmcj9+Kw0DUgIGq6fTTkaSNwbgNE1Jsg5Dj?= =?us-ascii?Q?5CyGUwl5AIFei21mQFhnfn1C51RpCSUEZLG1W5cp2tOCZcdGbFUwXKMHmod5?= =?us-ascii?Q?xpoduo8yf0L8eG2VSqAO7weeZ6pA4RTukRG9OeBqkqESItE35Mc8yUFKM31T?= =?us-ascii?Q?2RBCS0zIXk87AK8FotXa/4+f1TBbwqdhaFNTKVVxPiKrcktxcxBEX1RYEaCc?= =?us-ascii?Q?4xGnSvWyH74Q5pr4lAywoqby/94TgWXgtPbickravSNCFp1v2tuH2+QbcOQE?= =?us-ascii?Q?9ZMyX0KoGJQDQT0RsD7HJNFlyzhvtdTGqWzukt0uxXvxio0FLKVCTulbe/7V?= =?us-ascii?Q?/zY7mFuz/0NPDuNk71+eriuNbpXI3Cdbdl+MBsAvdiCL2I8jOzxFoHqfQIlt?= =?us-ascii?Q?yA/4RfLpHZprOsaEWgvvVd+UDhqqUVbxh5e471chC42s+aHxJzMq1F057cho?= =?us-ascii?Q?RoUHxbAaPWXbRuMr9deLycpAmHXcQG0cynY0MX1dhThn0eMZqIYTU05xXWnA?= =?us-ascii?Q?xEyrR9wCLCY9zVK5Jk3H/ZziOLN8xdmze9KnQZCz6O+7kDBZKyDOPGDCjSQA?= =?us-ascii?Q?CM2mUqXDXDrxu40lvCF5l0Cz94tQOqL1iPpXN1Y7acnSeIdplC7Ez+UuPlQf?= =?us-ascii?Q?rTli0NM+uPsN+rQXm8FvDWj+cHfNvbUkqNBxU+FkFYZV9XlO/wwYzaqzhcSQ?= =?us-ascii?Q?MAo3YBEaorPgsmpMSeIU8ZyFn7PMTWpSJiKq3E9FkaRwqhy9rJlF3wtHoYB+?= =?us-ascii?Q?0WcIq6vUfI9RMB0PPn4zW5ZQopnyzlimJU3sfnzCJywhp7E9b/3sq17m9ATP?= =?us-ascii?Q?qJzGdIIFGYK8Pj6MjPzS4mFbnqcdooLbwl53dSqZRUWjLWw8g6GvDHrSAxVr?= =?us-ascii?Q?lo2k3Nl+s4/CSDgqCmEYniux4VTrVufe48Gksnso6oDmzW9uknsd59I7Y7N6?= =?us-ascii?Q?Rw/x4KHa/MJqxDyHP5GvalfmqAjZ7hLrJFo47z7NW26b2iUPjSinfH9uK8JO?= =?us-ascii?Q?7tkm3I9s0vUcUxMvucOwzd19XV3cRVHinp/sFWDVcJ0p9yvFWvoru2dJIFKV?= =?us-ascii?Q?IFKeuFAm+mpeHrEz5SfFwEwF2VEJQneYTIOjdRugI3PRsISl14UJZcDhpitP?= =?us-ascii?Q?MQMXpI6mdFQyHXuFZ15VdrxtXUUV6aAVFFnD6Uia8tIkfdMM64CL+O4x+mB7?= =?us-ascii?Q?fRo6Q+lupzb+3A/tE2DNs1TnoeUroPZvDrFJTjP8FrFyoBKmnctQfb+olxp/?= =?us-ascii?Q?R/cqqyUbkzaTSoSU9GqDT2PxA1VDcOXF5h5xa3jomTvQkRY15j6tAqvKc9eL?= =?us-ascii?Q?GeV8wV9aM1Z6Nuj2gGDRI720M8gF5O4su6bBtNSfuQwScFayVy1D8tCW5aMu?= =?us-ascii?Q?qCDhCcr6CNl9vX6+RcYq/zLjDuzG3Vd7Pbe331+RT+rZeIkeWL9sS3VySb7f?= =?us-ascii?Q?wDT7Kr9svRTJMCxmZR1d/4NRbbkdzClvkVz8bSxWPvpG8w5a+N67hAIrG+2Z?= =?us-ascii?Q?nn+AfempNvurR0hfHUW1iOT198MTh9CsqWb3Zp25MjP/YYT3gFRfCyGNpUyh?= =?us-ascii?Q?4A=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7309.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 806d658a-9da2-4add-dd09-08ddcf7a42a2 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2025 15:03:36.6811 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: YnInl2sX28okxfFrCTsOediQUSuksNqLYm4GMv2dEdHkpuSINvtkcPvZwgtHnTllPtb4eilA/SWljF15LzQNa/Jq3PLBvNL2z4CKoo6B44c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR11MB8722 X-OriginatorOrg: intel.com 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 I would hold off on this patch for backport, even though it's a fix. I worr= y that some users may be depending on the old behaviour, especially if they= have a single-queue setup. /Bruce > -----Original Message----- > From: Xueming Li > Sent: Wednesday, July 30, 2025 3:56 PM > To: Richardson, Bruce > Cc: Xueming Li ; Burakov, Anatoly > ; dpdk stable > Subject: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement= ' has > been queued to stable release 23.11.5 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 23.11.5 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 08/10/25. So please > shout if anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he > 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 reba= sing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. >=20 > Queued patches are on a temporary branch at: > https://git.dpdk.org/dpdk-stable/log/?h=3D23.11-staging >=20 > This queued commit can be viewed at: > https://git.dpdk.org/dpdk-stable/commit/?h=3D23.11- > staging&id=3D43fdac7411d9a6d408b2ce61a5c191886c6ff638 >=20 > Thanks. >=20 > Xueming Li >=20 > --- > From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00 2001 > From: Bruce Richardson > Date: Fri, 27 Jun 2025 14:52:01 +0100 > Subject: [PATCH] net/ice: fix inconsistency in Rx queue VLAN tag placemen= t > Cc: Xueming Li >=20 > [ upstream commit 4cd8c72f661c005900ddc39cf0cecfca16184f2a ] >=20 > When VLAN or QinQ stripping is enabled in the ice driver, an > inconsistency was observed between the placement of the VLAN tag in the > descriptors of the final Rx queue (irrespective of the number of queues) > vs descriptors of all other queues. This inconsistency was due to the > fact that the driver - when updating l2tsel (L2 tag selection) field - > used the queue id, rather than the register index for the queue. Queue 0 > is normally HW queue 1, etc., meaning the final queue never had its > field updated. >=20 > Fixes: de5da9d16430 ("net/ice: support double VLAN") > Cc: stable@dpdk.org >=20 > Signed-off-by: Bruce Richardson > Acked-by: Anatoly Burakov > --- > drivers/net/ice/ice_ethdev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c > index be826d3108..3d08e12cba 100644 > --- a/drivers/net/ice/ice_ethdev.c > +++ b/drivers/net/ice/ice_ethdev.c > @@ -4744,11 +4744,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi = *vsi, > enum ice_l2tsel l2tsel) > l2tsel_bit =3D BIT(ICE_L2TSEL_BIT_OFFSET); >=20 > for (i =3D 0; i < dev_data->nb_rx_queues; i++) { > + const struct ice_rx_queue *rxq =3D dev_data->rx_queues[i]; > u32 qrx_context_offset; > u32 regval; >=20 > - qrx_context_offset =3D > - QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, > i); > + qrx_context_offset =3D > QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, rxq->reg_idx); >=20 > regval =3D rd32(hw, qrx_context_offset); > regval &=3D ~BIT(ICE_L2TSEL_BIT_OFFSET); > -- > 2.34.1 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2025-07-30 22:50:04.230786948 +0800 > +++ 0018-net-ice-fix-inconsistency-in-Rx-queue-VLAN-tag-place.patch 2025- > 07-30 22:50:03.048759617 +0800 > @@ -1 +1 @@ > -From 4cd8c72f661c005900ddc39cf0cecfca16184f2a Mon Sep 17 00:00:00 2001 > +From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00 > 2001 > @@ -4,0 +5,3 @@ > +Cc: Xueming Li > + > +[ upstream commit 4cd8c72f661c005900ddc39cf0cecfca16184f2a ] > @@ -21 +24 @@ > - drivers/net/intel/ice/ice_ethdev.c | 4 ++-- > + drivers/net/ice/ice_ethdev.c | 4 ++-- > @@ -24,5 +27,5 @@ > -diff --git a/drivers/net/intel/ice/ice_ethdev.c > b/drivers/net/intel/ice/ice_ethdev.c > -index 680e7724cd..513777e372 100644 > ---- a/drivers/net/intel/ice/ice_ethdev.c > -+++ b/drivers/net/intel/ice/ice_ethdev.c > -@@ -4988,11 +4988,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi= *vsi, > enum ice_l2tsel l2tsel) > +diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c > +index be826d3108..3d08e12cba 100644 > +--- a/drivers/net/ice/ice_ethdev.c > ++++ b/drivers/net/ice/ice_ethdev.c > +@@ -4744,11 +4744,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi > *vsi, enum ice_l2tsel l2tsel) > @@ -32 +35 @@ > -+ const struct ci_rx_queue *rxq =3D dev_data->rx_queues[i]; > ++ const struct ice_rx_queue *rxq =3D dev_data->rx_queues[i];