On Mon, Jan 6, 2020 at 2:05 PM Somnath Kotur <somnath.ko...@broadcom.com> wrote: > > Certain hardware may be able to strip and/or save only the outermost > VLAN instead of both the VLANs in the mbuf in a QinQ scenario. > To handle such cases, we could re-interpret setting of just > PKT_RX_QINQ_STRIPPED to indicate that only the outermost VLAN has > been stripped and saved in mbuf->vlan_tci_outer. > Only When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 > VLANs have been stripped by the hardware and their TCI are saved in > mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). > > Signed-off-by: Somnath Kotur <somnath.ko...@broadcom.com> > --- > lib/librte_mbuf/rte_mbuf_core.h | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h > index 9a8557d..db1070b 100644 > --- a/lib/librte_mbuf/rte_mbuf_core.h > +++ b/lib/librte_mbuf/rte_mbuf_core.h > @@ -124,12 +124,19 @@ > #define PKT_RX_FDIR_FLX (1ULL << 14) > > /** > - * The 2 vlans have been stripped by the hardware and their tci are > - * saved in mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). > + * The outer vlan has been stripped by the hardware and their tci are > + * saved in mbuf->vlan_tci_outer (outer). > * This can only happen if vlan stripping is enabled in the RX > * configuration of the PMD. > - * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN | > - * PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ) must also be set. > + * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN | PKT_RX_QINQ) > + * must also be set. > + * When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 > vlans > + * have been stripped by the hardware and their tci are saved in > + * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). > + * This can only happen if vlan stripping is enabled in the RX configuration > + * of the PMD. > + * When PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, > + * (PKT_RX_VLAN | PKT_RX_QINQ) must also be set. > */ > #define PKT_RX_QINQ_STRIPPED (1ULL << 15) > > -- > 1.8.3.1
Seeing as its been a month since it was submitted and no comments on it yet , are we ok to go ahead and merge this in please? Thanks Som
