[PATCH v2] net/intel: fix assumption about tag placement order

[Bruce Richardson]

On Thu, Aug 07, 2025 at 03:31:11PM +0100, Loftus, Ciara wrote:
> > 
> > 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")
> > Cc: stable at dpdk.org
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
> > ---
> >  drivers/net/intel/i40e/i40e_rxtx.c | 10 +++++++---
> >  drivers/net/intel/iavf/iavf_rxtx.c | 12 +++++++-----
> >  drivers/net/intel/ice/ice_rxtx.c   | 10 +++++++---
> >  3 files changed, 21 insertions(+), 11 deletions(-)
> 
> Acked-by: Ciara Loftus <ciara.loftus at intel.com>
>
Applied to dpdk-next-net-intel.

/Bruce