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 0B53D46CF5 for ; Mon, 11 Aug 2025 06:41:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF0E3400D5; Mon, 11 Aug 2025 06:41:27 +0200 (CEST) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mails.dpdk.org (Postfix) with ESMTP id D2D97400D5 for ; Mon, 11 Aug 2025 06:41:26 +0200 (CEST) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-61568fbed16so6157877a12.3 for ; Sun, 10 Aug 2025 21:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754887286; x=1755492086; darn=dpdk.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xro90fEkzzEoKAt/GchRSwaGMt4YcK3gd19YMukpKEQ=; b=ke3Uod1yYdtKMQM67m6IEXkbb5Uy5VOAz2uMFRGCqOkw52dSigOpixH2GJAq9ltuHR Xp8rl9M6c4v7BhkfJpawE6ymUv55fTV84FDNjKQ3AD23eICzfMbLyEw5tA7plNtj01ht sdHIf/LNWBW8bseBHZTdmfSVGSr7CaI443VsWWDhhiX94fw+okdrNibEkgWtFF6tR4b4 kYwCwTX1DTLLGTVGVN785ZyKdHhvlyTpQY/LHZevT/UocdRL/dhyb7jqPb7SHjrZ0dx4 v6r4ziM633Ce4AuiciJOuLDs0DahnqRrJyjh49/KEHMicA3k9sbuRKTfsJjWwsBcJJKF aqfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754887286; x=1755492086; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xro90fEkzzEoKAt/GchRSwaGMt4YcK3gd19YMukpKEQ=; b=daP3/13pwbSAdfdOL1OouN9YSGbwK00ECSV+Y9qZjHIXbpxukFojrN2t8LOTEliR2z 1Ftasw+4MWqWhvril8mv65OSpvUSrI3ygZL2T/OMAVlPYxVSVnGKHa6b+XNYELXMSBbp Z0FzZb6S1vYIfrvL3LgXfRDzExCguPv2F2zhyAcJSrsqZscQl4Xp3dR0B4wA8OzyB0Y/ vAaI2A3h03omd4xKpPZiLztIlZyc4ZZw/wjf7niVWJ5XWcoecSv3nE1nwa4zL2HGkn96 ohrzYMvA2N8BQsEneMhtwW8IrUMGwgty4xc/fhbqUg0Iw0TwIQkFBAJ7ShUjQJeOCCgl aowQ== X-Forwarded-Encrypted: i=1; AJvYcCX/II+DZ0d9gvTcRZ5mB1vx9+/zGu4P0m9PeW+CnrQ4Smpwcd+2XhzE1Hn+xRKW0a49JSGrNTw=@dpdk.org X-Gm-Message-State: AOJu0Yw3t8O7wv3GT9tRtGU5V6QuNl7gtByQxe6Tv0MLNNHvoKIMvqtj rTbEPODyavkAhpExHw5CLo/FqxKdsTiDUA+rJK4N+DlF4dMYCYSxBPO0CUjjIMij5W/2YGjlchH dKXDtYQZUgSPeX5ktSfQ4O/irxefqbd0= X-Gm-Gg: ASbGncssPi5PHBizHu4gngx7UdECgnXmyREBuM7UsUapqJZO3gqaNTCeaDeBSKivzO4 JHN1IAorMXoph6ui02oRPYke7Uww2sVDN4Pta0ZfeLgwS/tec16mpC7E5xYBeMGSL4yb66n5s+1 zX+VkhoxH3i9AKf9gX08Zy4z7qMzmiZKtII1kBTSv8dZKuPIE2usfeNbuQenSjPNLfB6fFQPm1R hdXYtTsmMV6QIdOxTOG2YBPNUwaurwsUxHwQg== X-Google-Smtp-Source: AGHT+IE5XNA4Rot/wq1iizEFQzOiEAm7BLI6Or6GPKxyAGfS3TkFNFh0LG7G4ftnt2TFEheARJDerf2je4CmoVXDZJc= X-Received: by 2002:a17:907:97d6:b0:ae3:ce75:afd8 with SMTP id a640c23a62f3a-af9c64d47a9mr1146620966b.30.1754887285949; Sun, 10 Aug 2025 21:41:25 -0700 (PDT) MIME-Version: 1.0 References: <20250626121657.32689-1-xuemingl@nvidia.com> <20250730072601.137797-1-xuemingl@nvidia.com> <060301dc0130$98cb4ab0$ca61e010$@trustnetic.com> In-Reply-To: From: Amiya Ranjan Mohakud Date: Mon, 11 Aug 2025 10:11:14 +0530 X-Gm-Features: Ac12FXxRSdcu65qd4-Q-IU3_Hha3qYbnVFQlLhmvTe2jyU_V625wGV4M-_OW1NI Message-ID: Subject: Re: please help backporting some patches to stable release 23.11.5 To: Xueming Li Cc: Jiawen Wu , dpdk stable , =?UTF-8?Q?Mattias_R=C3=B6nnblom?= , Akhil Goyal , Aman Singh , Amit Bernstein , Ankur Dwivedi , Anoob Joseph , Archana Muniganti , Arkadiusz Kusztal , Bing Zhao , Bruce Richardson , Christian Koue Muf , Ciara Loftus , Dariusz Sosnowski , Dengdui Huang , Erik Gabriel Carrillo , Evgeny Schemeilin , Ferruh Yigit , Gage Eads , Gowrishankar Muthukrishnan , Gregory Etelson , Harman Kalra , Harry van Haaren , Jay Zhou , Jerin Jacob , Jian Wang , Jie Hai , Kai Ji , Kiran Kumar K , Liang Ma , Maayan Kashani , Matan Azrad , Nithin Dabilpuram , Nithinsen Kaithakadan , Oleksandr Kolomeiets , Ori Kam , Pavan Nikhilesh , Peter Mccarthy , Pravin Pathak , Radu Nicolau , Rahul Bhansali , Rajesh Mudimadugula , Ray Kinsella , Ron Beider , Satha Rao , Serhii Iliushyk , Shai Brandes , Srujana Challa , Suanming Mou , Sunil Kumar Kori , Tejasree Kondoj , Timothy McDaniel , Tirthendu Sarkar , Slava Ovsiienko , Vidya Sagar Velumuri , Vladimir Medvedkin , Wajeeh Atrash , Yosef Raisman , Zaiyu Wang Content-Type: multipart/mixed; boundary="0000000000004d0acd063c0f89ca" 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 --0000000000004d0acd063c0f89ca Content-Type: multipart/alternative; boundary="0000000000004d0acc063c0f89c8" --0000000000004d0acc063c0f89c8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Xueming I think it's already taken care of. (attaching the mail thread). Could you please confirm ? Thanks Amiya On Sun, 10 Aug 2025 at 18:04, Xueming Li wrote: > Hi Amiya, > > Are you able to send it today or tomorrow? > ------------------------------ > *From:* Amiya Ranjan Mohakud > *Sent:* Wednesday, July 30, 2025 8:55 PM > *To:* Xueming Li > *Cc:* Jiawen Wu ; dpdk stable ; > Mattias R=C3=B6nnblom ; Akhil Goyal < > gakhil@marvell.com>; Aman Singh ; Amit > Bernstein ; Ankur Dwivedi ; > Anoob Joseph ; Archana Muniganti ; > Arkadiusz Kusztal ; Bing Zhao < > bingz@nvidia.com>; Bruce Richardson ; > Christian Koue Muf ; Ciara Loftus < > ciara.loftus@intel.com>; Dariusz Sosnowski ; > Dengdui Huang ; Erik Gabriel Carrillo < > erik.g.carrillo@intel.com>; Evgeny Schemeilin ; > Ferruh Yigit ; Gage Eads ; > Gowrishankar Muthukrishnan ; Gregory Etelson < > getelson@nvidia.com>; Harman Kalra ; Harry van Haaren > ; Jay Zhou ; Jerin > Jacob ; Jian Wang ; Jie Hai = < > haijie1@huawei.com>; Kai Ji ; Kiran Kumar K < > kirankumark@marvell.com>; Liang Ma ; Maayan > Kashani ; Matan Azrad ; Nithin > Dabilpuram ; Nithinsen Kaithakadan < > nkaithakadan@marvell.com>; Oleksandr Kolomeiets ; > Ori Kam ; Pavan Nikhilesh ; > Peter Mccarthy ; Pravin Pathak < > pravin.pathak@intel.com>; Radu Nicolau ; Rahul > Bhansali ; Rajesh Mudimadugula < > rmudimadugul@marvell.com>; Ray Kinsella ; Ron Beider < > rbeider@amazon.com>; Satha Rao ; Serhii Iliushyk = < > sil-plv@napatech.com>; Shai Brandes ; Srujana Challa > ; Suanming Mou ; Sunil Kumar > Kori ; Tejasree Kondoj ; > Timothy McDaniel ; Tirthendu Sarkar < > tirthendu.sarkar@intel.com>; Slava Ovsiienko ; > Vidya Sagar Velumuri ; Vladimir Medvedkin < > vladimir.medvedkin@intel.com>; Wajeeh Atrash ; Yosef > Raisman ; Zaiyu Wang > *Subject:* Re: please help backporting some patches to stable release > 23.11.5 > > Hi Xueming > I will back-port the below commit and Ack you back in a day or two. > > *5503bbc975 Amiya Ranjan Mohakud net/iavf: fix VLAN strip disabling for > ADQ v2 capability* > > Thanks > Amiya > > > On Wed, 30 Jul 2025 at 17:47, Xueming Li wrote: > > Hi Jiawen, > > Thanks for your support. I don't know why below patches are dropped, will > track the scripts later. > I've backport them manually, please check. > > Best Regards, > Xueming Li > > ------------------------------ > *From:* Jiawen Wu > *Sent:* Wednesday, July 30, 2025 5:01 PM > *To:* 'dpdk stable' > *Cc:* 'Mattias R=C3=B6nnblom' ; 'Akhil Goy= al' < > gakhil@marvell.com>; 'Aman Singh' ; 'Amit > Bernstein' ; 'Amiya Ranjan Mohakud' < > amiyaranjan.mohakud@gmail.com>; 'Ankur Dwivedi' ; > 'Anoob Joseph' ; 'Archana Muniganti' < > marchana@marvell.com>; 'Arkadiusz Kusztal' = ; > Bing Zhao ; 'Bruce Richardson' < > bruce.richardson@intel.com>; 'Christian Koue Muf' ; > 'Ciara Loftus' ; Dariusz Sosnowski < > dsosnowski@nvidia.com>; 'Dengdui Huang' ; 'Erik > Gabriel Carrillo' ; 'Evgeny Schemeilin' < > evgenys@amazon.com>; 'Ferruh Yigit' ; 'Gage Eads' < > gage.eads@intel.com>; 'Gowrishankar Muthukrishnan' < > gmuthukrishn@marvell.com>; Gregory Etelson ; 'Harman > Kalra' ; 'Harry van Haaren' < > harry.van.haaren@intel.com>; 'Jay Zhou' ; 'Jerin > Jacob' ; 'Jian Wang' ; 'Jie > Hai' ; 'Kai Ji' ; 'Kiran Kumar K' < > kirankumark@marvell.com>; 'Liang Ma' ; Maayan > Kashani ; Matan Azrad ; 'Nithin > Dabilpuram' ; 'Nithinsen Kaithakadan' < > nkaithakadan@marvell.com>; 'Oleksandr Kolomeiets' ; > Ori Kam ; 'Pavan Nikhilesh' ; > 'Peter Mccarthy' ; 'Pravin Pathak' < > pravin.pathak@intel.com>; 'Radu Nicolau' ; 'Rahul > Bhansali' ; 'Rajesh Mudimadugula' < > rmudimadugul@marvell.com>; 'Ray Kinsella' ; 'Ron Beider' < > rbeider@amazon.com>; 'Satha Rao' ; 'Serhii > Iliushyk' ; 'Shai Brandes' ; > 'Srujana Challa' ; Suanming Mou ; > 'Sunil Kumar Kori' ; 'Tejasree Kondoj' < > ktejasree@marvell.com>; 'Timothy McDaniel' ; > 'Tirthendu Sarkar' ; Slava Ovsiienko < > viacheslavo@nvidia.com>; 'Vidya Sagar Velumuri' ; > 'Vladimir Medvedkin' ; 'Wajeeh Atrash' < > atrwajee@amazon.com>; 'Yosef Raisman' ; 'Zaiyu Wang' > > *Subject:* RE: please help backporting some patches to stable release > 23.11.5 > > Hi Xueming Li, > > > > 26bf49930c Jiawen Wu net/ngbe: restrict VLAN strip configuratio= n > on VF > > This patch should be dropped. > > > db4878838a Jiawen Wu net/txgbe: fix FDIR perfect mode for IPv6 > > a1851465f8 Jiawen Wu net/txgbe: fix to create FDIR filter for > tunnel packet > > I'll backport these two patches. > > But there are some patches missed in 23.11-staging, and are not mentioned > here. > Should I backport these? > > 8d10841e5acd net/txgbe: fix packet type for FDIR filter > 0db38d54b57a net/txgbe: fix to create FDIR filter for SCTP packet > 3f5886d6435e net/txgbe: fix reserved extra FDIR headroom > 5bc6a8b17afb net/txgbe: add LRO flag in mbuf when enabled > > --0000000000004d0acc063c0f89c8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Xueming

I think it's already taken care = of. (attaching=C2=A0the mail thread). Could you please confirm=C2=A0?
=
Thanks
Amiya

On Sun, 1= 0 Aug 2025 at 18:04, Xueming Li <xuemingl@nvidia.com> wrote:
Hi Amiya,

Are you able to send it today or tomorrow?=C2=A0
From: Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>= ;
Sent: Wednesday, July 30, 2025 8:55 PM
To: Xueming Li <xuemingl@nvidia.com>
Cc: Jiawen Wu <jiawenwu@trustnetic.com>; dpdk stable <stable@dpdk.org>; Mattias R= =C3=B6nnblom <mattias.ronnblom@ericsson.com>; Akhil Goyal <gakhil@marvell.com>; Am= an Singh <aman.deep.singh@intel.com>; Amit Bernstein <amitbern@amazon.com>; Ankur Dwi= vedi <adwivedi= @marvell.com>; Anoob Joseph <a= noobj@marvell.com>; Archana Muniganti <marchana@marvell.com>; Arkadiusz Kus= ztal <= arkadiuszx.kusztal@intel.com>; Bing Zhao <bingz@nvidia.com>; Bruce Richardson &= lt;bruce.ri= chardson@intel.com>; Christian Koue Muf <ckm@napatech.com>; Ciara Loftus <ciara.loft= us@intel.com>; Dariusz Sosnowski <dsosnowski@nvidia.com>; Dengdui Huang &l= t;huangdengdui= @huawei.com>; Erik Gabriel Carrillo <erik.g.carrillo@intel.com>; Evgen= y Schemeilin <ev= genys@amazon.com>; Ferruh Yigit <ferruh.yigit@amd.com>; Gage Eads <gage.eads@intel.com= >; Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>; Gregory Etelson <getelson@nvidia.com<= /a>>; Harman Kalra <hkalra@marvell.com>; Harry van Haaren <harry.van.haaren@intel.com= >; Jay Zhou <jianjay.zhou@huawei.com>; Jerin Jacob <jerinj@marvell.com>; Jian Wang <jianwang@= trustnetic.com>; Jie Hai <haijie1@huawei.com>; Kai Ji <kai.ji@intel.com>; Kiran Kumar K = <kirankumar= k@marvell.com>; Liang Ma <liangma@bytedance.com>; Maayan Kashani <mkashani@nvidia.com= >; Matan Azrad <matan@nvidia.com>; Nithin Dabilpuram <ndabilpuram@marvell.com>; Nithinsen Kaithakadan <nkaithakadan@marvell.com>; Oleksandr Kolomeiets <okl-plv@napatech.co= m>; Ori Kam <orika@nvidia.com>; Pavan Nikhilesh <pbhagavatula@marvell.com>; Peter = Mccarthy <= peter.mccarthy@intel.com>; Pravin Pathak <pravin.pathak@intel.com>; Radu Nicolau <ra= du.nicolau@intel.com>; Rahul Bhansali <rbhansali@marvell.com>; Rajesh Mudi= madugula <= rmudimadugul@marvell.com>; Ray Kinsella <mdr@ashroe.eu>; Ron Beider <rbeider@amazon.com>; S= atha Rao <sk= oteshwar@marvell.com>; Serhii Iliushyk <sil-plv@napatech.com>; Shai Brandes <= shaibran@amazon.com>; Srujana Challa <schalla@marvell.com>; Suanming Mou <= ;suanmingm@nvidia= .com>; Sunil Kumar Kori <skori@marvell.com>; Tejasree Kondoj <ktejasree@marvell.com>= ; Timothy McDaniel <timothy.mcdaniel@intel.com>; Tirthendu Sarkar <tirthendu.sarkar@= intel.com>; Slava Ovsiienko <viacheslavo@nvidia.com>; Vidya Sagar Velumuri <vvelumuri@marvell.com>= ;; Vladimir Medvedkin <vladimir.medvedkin@intel.com>; Wajeeh Atrash <atrwajee@amazon.com<= /a>>; Yosef Raisman <yraisman@amazon.com>; Zaiyu Wang <zaiyuwang@trustnetic.com> Subject: Re: please help backporting some patches to stable release = 23.11.5
=C2=A0
Hi=C2=A0Xueming
I will back-port the below commit and Ack you back in a day or two.

5503bbc975=C2=A0 Amiya Ranjan Mohakud net/iavf: fix VLAN strip disabling= for ADQ v2 capability

Thanks
Amiya


On Wed, 30 Jul 2025 at 17:47, Xueming Li <xuemingl@nvidia.com> wro= te:
Hi Jiawen,

Thanks for your support. I don't know why below patches are dropped, wi= ll track the scripts later.
I've backport them manually, please check.

Best Regards,
Xueming Li

From:=C2=A0Jiawen Wu <jiawenwu@trustnetic.com>
Sent:=C2=A0Wednesday, July 30, 2025 5:01 PM
To:=C2=A0'dpdk stable' <stable@dpdk.org>
Cc:=C2=A0'Mattias R=C3=B6nnblom' <mattias.ronnblom@ericsson.com>; 'Akhil Goyal' <gakhil@marvell.com>; 'Aman Singh' <aman.deep.singh@int= el.com>; 'Amit Bernstein' <amitbern@amazon.com>; 'Amiya Ranjan Mohakud' <= ;amiyara= njan.mohakud@gmail.com>; 'Ankur Dwivedi' <adwivedi@marvell.com>; 'Anoob Joseph' <anoobj@marvell.com>; 'Archana Muniganti' <marchana@marvell.com>; 'Arkadiusz Kusztal' <arkadiuszx.kusztal@intel.com>; Bing Zhao <bingz@= nvidia.com>; 'Bruce Richardson' <bruce.richardson@intel.com>;= 'Christian Koue Muf' <ckm@napatech.com>; 'Ciara Loftus' <ciara.loftus@intel.com>; Dariusz Sosnowski <dsosnowski@nvidia.com>; 'Dengdui Huang' <huangdengdui@huawei.com>; 'Erik Gabriel Carrillo' <erik.g.carrillo@intel.com>; 'Evgeny Sch= emeilin' <ev= genys@amazon.com>; 'Ferruh Yigit' <ferruh.yigit@amd.com>; 'Gage Eads' <gage.eads@intel.com>; 'Gowrishankar Muthukrishnan' &l= t;gmuthukrish= n@marvell.com>; Gregory Etelson <getelson@nvidia.com>; 'Harman Kalra' <hkalra@marvell.com>; 'Harry van Haaren' <harry.van.haaren@i= ntel.com>; 'Jay Zhou' <jianjay.zhou@huawei.com>; 'Jerin Jacob' <jerinj@marvell.com>; 'Jian Wang' <jianwang@trustnetic.com&g= t;; 'Jie Hai' <haijie1@huawei.com>; 'Kai Ji' <kai.ji@intel.com>; 'Kiran Kumar K' <kirankumark@marvell.com>; &= #39;Liang Ma' <liangma@bytedance.com>; Maayan Kashani <mkashani@nvidia.com>; Matan Azrad <matan@nvidia.com>; 'Nithin Dabilpuram&= #39; <ndabi= lpuram@marvell.com>; 'Nithinsen Kaithakadan' <nkaithakadan@marvell.com>; 'Oleksandr Ko= lomeiets' <okl-plv@napatech.com>; Ori Kam <orika@nvidia.com>; 'Pavan Nikhilesh' <pbhagavatula@marvell.com>; 'Peter Mccarthy'= ; <peter.m= ccarthy@intel.com>; 'Pravin Pathak' <pravin.pathak@intel.com>; 'Radu Nicolau' <radu.nicolau@intel.com>; 'Rahul Bhansali' <<= a href=3D"mailto:rbhansali@marvell.com" target=3D"_blank">rbhansali@marvell= .com>; 'Rajesh Mudimadugula' <rmudimadugul@marvell.com>; 'Ray Kinsella' <mdr@ashroe.eu>; 'Ron Beider' <rbeider@amazon.com>; 'Satha Rao= ' <skote= shwar@marvell.com>; 'Serhii Iliushyk' <sil-plv@napatech.com>; 'Shai Brandes' <shaibran@amazon.com>; 'Srujana Challa' <schalla@marvell.com>; Suanming Mou <suanmingm@nvidia.com>; 'Sunil Kumar Kori' <skori@marvell.com>; 'T= ejasree Kondoj' <ktejasree@marvell.com>; 'Timothy McDaniel' <timothy.mcdaniel@intel.com>; 'Tirthendu Sar= kar' <tirthendu.sarkar@intel.com>; Slava Ovsiienko <viacheslavo@nvidia.com>; 'Vidya Sagar Velumuri' <vvelumuri@marvell.com>; 'Vladimir Medvedkin&= #39; <= vladimir.medvedkin@intel.com>; 'Wajeeh Atrash' <atrwajee@amazon.com&g= t;; 'Yosef Raisman' <yraisman@amazon.com>; 'Zaiyu Wang' <zaiyuwang@trustnetic= .com>
Subject:=C2=A0RE: please help backporting some patches to stable rel= ease 23.11.5

Hi Xueming Li,


> 26bf49930c=C2=A0 Jiawen Wu=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 n= et/ngbe: restrict VLAN strip configuration on VF

This patch should be dropped.

> db4878838a=C2=A0 Jiawen Wu=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 n= et/txgbe: fix FDIR perfect mode for IPv6
> a1851465f8=C2=A0 Jiawen Wu=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 n= et/txgbe: fix to create FDIR filter for tunnel packet

I'll backport these two patches.

But there are some patches missed in 23.11-staging, and are not mentioned h= ere.
Should I backport these?

8d10841e5acd=C2=A0=C2=A0=C2=A0 net/txgbe: fix packet type for FDIR filter 0db38d54b57a=C2=A0=C2=A0=C2=A0 net/txgbe: fix to create FDIR filter for SCT= P packet
3f5886d6435e=C2=A0=C2=A0=C2=A0 net/txgbe: fix reserved extra FDIR headroom<= br> 5bc6a8b17afb=C2=A0=C2=A0=C2=A0 net/txgbe: add LRO flag in mbuf when enabled=

--0000000000004d0acc063c0f89c8-- --0000000000004d0acd063c0f89ca Content-Type: message/rfc822; name="patch 'net_iavf_ fix VLAN strip setting after enabling filter' has been queued to stable release 23.11.5.eml" Content-Disposition: attachment; filename="patch 'net_iavf_ fix VLAN strip setting after enabling filter' has been queued to stable release 23.11.5.eml" Content-Transfer-Encoding: 8bit Content-ID: X-Attachment-Id: f_me6mk2am0 Delivered-To: amiyaranjan.mohakud@gmail.com Received: by 2002:a05:7413:e0c:b0:169:fb23:8ee1 with SMTP id us12csp976441rdb; Wed, 30 Jul 2025 08:00:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG82lmxKS35p1tHc0CTO6GVDUOrJLURLzIvX+ekZs7GAj51Y8LZfhOEs++sk370obczMGLP X-Received: by 2002:a25:2087:0:b0:e8d:7121:c1c7 with SMTP id 3f1490d57ef6-e8e31603c09mr2782431276.38.1753887620122; Wed, 30 Jul 2025 08:00:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1753887620; cv=pass; d=google.com; s=arc-20240605; b=QICkS3dOWxQu4gfd5Fa3ePPqv5lPKgKSUjmL9L/6F30Zd5j1RZQOKEjd3AzXVBh2sZ tVahwh/YWLxKBlxLnjHJxegC3hXb7ursA+tWQBZdIKKtW1Z3q7aWJRkNNgjNm/7KUvId 2678Immhh6yeTDBuF7DpMWlwFl95yu7xuLZH9q5MrAun5z56N8Gxwnyndsct1snxyfFp IzVV7jAHaLNZY2AlcCISb1nUevMALWjWNqyJTJruZh/dWfqEWwFlaKB0U37ZHnEQbrVe 5HoLjTXiGBtLKMG8tfuajkaEVleEO1mDeyghQHJARSzDtCvepb0W90fx0GIJNzOzFkV3 VtSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=+ePBVnGqaCaB1TofPSgXFX3pyDzJZM0jJeCUahFm7Y4=; fh=IouzVfB70M8W6a/ugJ+e6DRJ/e691BkgB74FRXdN+hk=; b=Zb3M4PJ8HyzcMCcAywu3MUlH/wRaqQvLqy+YPu0NYusgdCwm3mWyeHdA/DJzsBdN2n u9t2hSTF2z4JqjFVuf18QXIuxcDdZdiof1zMkprkTKZCaaD1mL8bDYjR60fGSRLR1WBe 925kdJybWTSAHEaq/dgZkkQ1fDPQ9FqLSzh+chnXfgmp23L+WjI7XkRH26PoGlUmyrza TIi594Fo+VOoftl0C/LYsjJu8PHV2BytUyfR+OY8kKK7jVifoA6TAx6sr4wJcbxIPIQw o61/dovtFUFfnY4Y3x++ZXZol/c0mQzwDU64wDuhBYRNb4ajfDC8uBzN2Xsig6CnKSfI Qu7g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=mK0vgSPi; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of xuemingl@nvidia.com designates 2a01:111:f403:2416::62b as permitted sender) smtp.mailfrom=xuemingl@nvidia.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Return-Path: Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2062b.outbound.protection.outlook.com. [2a01:111:f403:2416::62b]) by mx.google.com with ESMTPS id 3f1490d57ef6-e8e03bb6c8fsi5848642276.18.2025.07.30.08.00.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 08:00:20 -0700 (PDT) Received-SPF: pass (google.com: domain of xuemingl@nvidia.com designates 2a01:111:f403:2416::62b as permitted sender) client-ip=2a01:111:f403:2416::62b; Authentication-Results: mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=mK0vgSPi; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of xuemingl@nvidia.com designates 2a01:111:f403:2416::62b as permitted sender) smtp.mailfrom=xuemingl@nvidia.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uR3XUQTKKbIjI7I3HRS8acxoARwn2LZUi0UtK153Z17SjvZu0NbHP33vJsYI5CLbJT0xRm5N370litMRn7VQah+E4PkRV2iRTxlR/54n/JGpWc+ZkVM8YVDbB+celtCkC9Et3hq/WVSQ111kx++OWmR5Uo349tNlzaupr9absZuNVfKpoplYzFbRcTKt04UIswcH1k1j0D196q63QP/c2epve1SaBpsxyUP8j1O356AorrE8BntBQ+empGIek1li5Sfju6LZTryy+Z6Al9eiBNFdpUWaNp7g4DHQQfGcqZnUqF87qNSwFvXiODisQUdx6qF6Lpyz0hhupRHW2r3Z4g== 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=+ePBVnGqaCaB1TofPSgXFX3pyDzJZM0jJeCUahFm7Y4=; b=SiEDaH2WLMIk8Pqn0hsI//bkv0GRL7/hNnkNf2VcjqUuHNd0ShiAgAnNgZ8zaOlt1LXiATYrTtcchxpCYfaSNcRNTIrGg4qMVifg1Obi2KfJpk3mO7xrNwJ5c0pIuV54BctFGGI5yZ1wVADGea1/kANpqPpmHy/a+YjmC6FMMRSFyes0PD8L5IuFwCrapsXC8M/TLHw9ASf1ZNMxawTUzJD2hXDWGmWJD/ls+08W7DON8PwS4IKueHmaW9bXKyWIS7lfg8UTkFV4h1NBziRB7YimphVW0awNWptg+QA8RxcDaL6+0gCZQaktHdGKOg/CYrEafaY1DFnb8R87IPX5wQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.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=+ePBVnGqaCaB1TofPSgXFX3pyDzJZM0jJeCUahFm7Y4=; b=mK0vgSPil+A2GN4OcXQ/3CXSDDsa1QUYhmxSxQL4o/ZgADpgboGL6uDTVIfjvQY2n/Qt71YiMg5NQkDDUmvwFPYVAskX6+KFzPHt9SEtVkMaqRUTSwcmzzSBy13z4Om1WkCF6I5R6R26o8ETP3VLvFWUm2kd0j/7bmcKaacsfTcEYesAiNSLuY4wmNxLsV0Y2ISah41HRig1tyy72ezV4WLIHnRf16IqcrfxbNjZLAkkxSGClABZHkmmFLb2kWnW0hDTbMMvMNUkzlyMLEu7FFyN7was3VAo+3mcnKbLJzaWfPndrH9Dr0DwYqdj8Hfobgl0pH3M8MsW1eJMOCLuAA== Received: from BN9PR03CA0685.namprd03.prod.outlook.com (2603:10b6:408:10e::30) by SA3PR12MB9159.namprd12.prod.outlook.com (2603:10b6:806:3a0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 15:00:16 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:408:10e:cafe::8b) by BN9PR03CA0685.outlook.office365.com (2603:10b6:408:10e::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 15:00:16 +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 BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 15:00:16 +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.1544.14; Wed, 30 Jul 2025 07:59:53 -0700 Received: from nvidia.com (10.126.230.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.1544.14; Wed, 30 Jul 2025 07:59:42 -0700 From: Xueming Li To: Amiya Ranjan Mohakud CC: Xueming Li , Ciara Loftus , dpdk stable Subject: patch 'net/iavf: fix VLAN strip setting after enabling filter' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:19 +0800 Message-ID: <20250730145633.245984-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: xuemingl@nvidia.com X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|SA3PR12MB9159:EE_ X-MS-Office365-Filtering-Correlation-Id: 99f66953-f422-4152-a853-08ddcf79cb52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?k8tyh8sEfAAhOjduwzugPVQ+nWs8gzM7sqzNmZfkIj0USRktA1tAqzDLTSJ3?= =?us-ascii?Q?SXdp3o8vRVT8MwT9kmaUmAzbTCcGFZqvUiILyl2LcwU3HgBWPJpFI+op31TG?= =?us-ascii?Q?8JmjKl6Ri0hbQPy1UPH7faciLiJ0Y+5anP7RbbZHCWni9eyXSJ7F3xw5qcjt?= =?us-ascii?Q?kOuSyCCRDfUNS9qU0IrZ8bBvhKpmdVfw98sD6EfgAaf7D8OhL7C/q54Uls1o?= =?us-ascii?Q?yr60v8IXg9MYOG4xO5Zn5Dv+rnUUtX/Jj3QPKccDSXq0Z0Qii37i0gVPznI+?= =?us-ascii?Q?UvzFDk2bXBIQACwK5OeYVDjsuSqnHRZX7dlswskCTnPhJwNSBNHiGVORwqbc?= =?us-ascii?Q?wIWsMIR4I9VXXIFKkgRvdsYmOpFBXE4Mu/doOv9AO0Qo+2C3TE84cCN/xvVs?= =?us-ascii?Q?pFGos9jjK34KB5M1VEkR+jUv+5U+XGStQGQDkGutvI3DG4ck/M6TgvB26G/K?= =?us-ascii?Q?rjAHYj7snLTZavSY+KxXNtGf7UsPMsxz90AFNcQJ2GE7zlzfHpj8f0zWt5NJ?= =?us-ascii?Q?DfLX5g0fW6u7jPadEkxERqxLhFgcP32ZYqJ5iHz4FPEZz9WMjiKBe1lQbzPK?= =?us-ascii?Q?ypH9mSCl0iBHkEhVxpV2HpKhIHE8qQ+69OWd0BIjsWx31PurfwzfaOy2fx8x?= =?us-ascii?Q?jjA9xd3ZuKifoeBJDwd606vgTBWVWyR5nJpMRgFg3WGo9JVUCKOwwUYMjrPt?= =?us-ascii?Q?WiKOTwCgy/L8iVaFJDR64T5mEbstMpP1PEzqLu6ie81ETI8PzIsvbhCYISLp?= =?us-ascii?Q?WE9N6L563TjFFiXVwtpRnFOpFFRj2oYWjBegASon9gXAduSoLsLrTTerkqRO?= =?us-ascii?Q?UYZJFIvM/YcLAtI7TgwEWhjYyR3uX46jOUPbmukmdM3C1xftfEYwlYPe5odA?= =?us-ascii?Q?aabTNqfbLuWt31kjVoHRdGSIc051wlxdXwpXFPzhSmWkIjTXnS47bQlP1Byf?= =?us-ascii?Q?w0BgIbtsqs0xGdgJMOLKEQNJPxr4liG4OWCddAaaygLQvVCmQu5BQZ2diEUQ?= =?us-ascii?Q?TGNoM/MnJDJn3IHPJS/C9N0U0QdLnJmTmQaqZTmbAiycE6ZYPL0AG3+pq3kL?= =?us-ascii?Q?Z12uVXeknirBOQBTP4AfETfdxxbOvNMI0deHdxZ1c+26bYidAAzoqm84IXIs?= =?us-ascii?Q?XMLsnhS3Ai7qeDzRd9Z7rq3fSfFwShWfAbgPmVBY7y8igdIcliTKOQrI36vS?= =?us-ascii?Q?SmH7lNx4vW2D98Gl8NTa1PmHs7e07wXfneWNnQVPrV9Pjap5eRuzn6EKv5hY?= =?us-ascii?Q?twokgAGEzgOTRu9UaTnkXQp+nJLP9+6uauYCNpNFsNByGkPmuWImsRvZo7Vw?= =?us-ascii?Q?4HSS9QEjm8FUL3+x0AGv3vQesuKqvr6Sq2Ara63uxbGkvStSgGU84nYFb641?= =?us-ascii?Q?QD1DAvPQwUeHyBD4OkbFSiJ0s/ZbezTnVjeplK76SU9l1h8faZ4THjiWpcDd?= =?us-ascii?Q?fG3D4Rc+QzpKZZbTmyQ3zhjTAdVV+D836lyC+TcMmbz02E77hlYcZQpJvBPW?= =?us-ascii?Q?JMYeMmgm/89z2rDXgFn8+nx6m4WUeKG8eLj4?= 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)(36860700013)(82310400026)(1800799024)(376014)(7053199007);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 15:00:16.2622 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99f66953-f422-4152-a853-08ddcf79cb52 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: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9159 Hi, FYI, your patch has been queued to stable release 23.11.5 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. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=f2c11a141c46c6a9d461493b70490940d8147680 Thanks. Xueming Li --- >From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001 From: Amiya Ranjan Mohakud Date: Mon, 23 Jun 2025 23:41:36 +0530 Subject: [PATCH] net/iavf: fix VLAN strip setting after enabling filter Cc: Xueming Li [ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ] For i40e kernel drivers which support either vlan(v1) or vlan(v2) VIRTCHNL OP, it will set strip on when setting filter on. But DPDK side will not change strip flag. To be consistent with DPDL side, explicitly disable strip again. Bugzilla ID: 1725 Fixes: e25c7ed114b2 ("net/iavf: fix VLAN offload strip flag") Cc: stable@dpdk.org Signed-off-by: Amiya Ranjan Mohakud Reviewed-by: Ciara Loftus --- .mailmap | 1 + drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.mailmap b/.mailmap index e17823a260..80c6f855dc 100644 --- a/.mailmap +++ b/.mailmap @@ -84,6 +84,7 @@ Amir Avivi Amit Bernstein Amit Gupta Amit Prakash Shukla +Amiya Ranjan Mohakud Amr Mokhtar Amruta Zende Amrutha Sampath diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 4472fd2c2d..391ba2c812 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index) vf->mac_num--; } +static int +iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) +{ + /* For i40e kernel drivers which supports both vlan(v1 & v2) VIRTCHNL OP, + * it will set strip on when setting filter on but dpdk side will not + * change strip flag. To be consistent with dpdk side, explicitly disable + * strip again. + * + */ + struct iavf_adapter *adapter = + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct rte_eth_conf *dev_conf = &dev->data->dev_conf; + int err; + + if (adapter->hw.mac.type == IAVF_MAC_XL710 || + adapter->hw.mac.type == IAVF_MAC_VF || + adapter->hw.mac.type == IAVF_MAC_X722_VF) { + if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) { + err = iavf_disable_vlan_strip(adapter); + if (err) + return -EIO; + } + } + return 0; +} + static int iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) { struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); - struct rte_eth_conf *dev_conf = &dev->data->dev_conf; int err; if (adapter->closed) @@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) err = iavf_add_del_vlan_v2(adapter, vlan_id, on); if (err) return -EIO; - return 0; + + return iavf_disable_vlan_strip_ex(dev, on); } if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) @@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) if (err) return -EIO; - /* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP, - * it will set strip on when setting filter on but dpdk side will not - * change strip flag. To be consistent with dpdk side, disable strip - * again. - * - * For i40e kernel driver which supports vlan v2, dpdk will invoke vlan v2 - * related function, so it won't go through here. - */ - if (adapter->hw.mac.type == IAVF_MAC_XL710 || - adapter->hw.mac.type == IAVF_MAC_X722_VF) { - if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) { - err = iavf_disable_vlan_strip(adapter); - if (err) - return -EIO; - } - } - return 0; + return iavf_disable_vlan_strip_ex(dev, on); } static void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:03.776876738 +0800 +++ 0010-net-iavf-fix-VLAN-strip-setting-after-enabling-filte.patch 2025-07-30 22:50:03.000752668 +0800 @@ -1 +1 @@ -From 3bfad066f9b4764981c9ad90a750fa6f1afcf15a Mon Sep 17 00:00:00 2001 +From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ] @@ -18,2 +21,2 @@ - .mailmap | 1 + - drivers/net/intel/iavf/iavf_ethdev.c | 48 +++++++++++++++++----------- + .mailmap | 1 + + drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------- @@ -23 +26 @@ -index c6d72058bb..1b238970fb 100644 +index e17823a260..80c6f855dc 100644 @@ -26 +29 @@ -@@ -88,6 +88,7 @@ Amir Avivi +@@ -84,6 +84,7 @@ Amir Avivi @@ -34,5 +37,5 @@ -diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c -index 02649c19b2..c33fdd9069 100644 ---- a/drivers/net/intel/iavf/iavf_ethdev.c -+++ b/drivers/net/intel/iavf/iavf_ethdev.c -@@ -1377,13 +1377,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index) +diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c +index 4472fd2c2d..391ba2c812 100644 +--- a/drivers/net/iavf/iavf_ethdev.c ++++ b/drivers/net/iavf/iavf_ethdev.c +@@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index) @@ -78 +81 @@ -@@ -1393,7 +1418,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -88 +91 @@ -@@ -1403,23 +1429,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) --0000000000004d0acd063c0f89ca--