> Signed-off-by: Shaopeng He <shaopeng.he at intel.com>
> ---
> ChangeLog:
>
> v2:
> * change flag PKT_RX_VLAN_PKT to always set
> * preserve the priority bits in vlan_tci
>
> drivers/net/fm10k/fm10k_rxtx.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/fm10k/fm10k_rxtx.c
> b/drivers/net/fm10k/fm10k_rxtx.c
> index 1bac28d..764f4f4 100644
> --- a/drivers/net/fm10k/fm10k_rxtx.c
> +++ b/drivers/net/fm10k/fm10k_rxtx.c
> @@ -104,8 +104,14 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const
> union fm10k_rx_desc *d)
> (FM10K_RXD_STATUS_L4CS | FM10K_RXD_STATUS_L4E)))
> m->ol_flags |= PKT_RX_L4_CKSUM_BAD;
>
> - if (d->d.staterr & FM10K_RXD_STATUS_VEXT)
> - m->ol_flags |= PKT_RX_VLAN_PKT;
> + /**
> + * fm10k's Ethernet switch core associates a VLAN ID and VLAN PRI
Change to Packets in fm10k device always carries a vlan tag?
> + * for each packet. For those packets coming in without a VLAN,
> + * the port default VLAN ID will be used.
> + * So in fm10k, always PKT_RX_VLAN_PKT flag is set and vlan_tci
> + * is valid for each RX packet's mbuf.
> + */
> + m->ol_flags |= PKT_RX_VLAN_PKT;
Since vlan_tci is always valid, is it better to move above line to below added
lines?
>
> if (unlikely(d->d.staterr & FM10K_RXD_STATUS_HBO))
> m->ol_flags |= PKT_RX_HBUF_OVERFLOW;
> @@ -146,6 +152,8 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts,
> #endif
>
> mbuf->hash.rss = desc.d.rss;
> + /* in fm10k, vlan_tci is always valid for RX packet */
> + mbuf->vlan_tci = desc.w.vlan;
>
> rx_pkts[count] = mbuf;
> if (++next_dd == q->nb_desc) {
> @@ -292,6 +300,8 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct
> rte_mbuf **rx_pkts,
> rx_desc_to_ol_flags(first_seg, &desc);
> #endif
> first_seg->hash.rss = desc.d.rss;
> + /* in fm10k, vlan_tci is always valid for RX packet */
> + first_seg->vlan_tci = desc.w.vlan;
>
> /* Prefetch data of first segment, if configured to do so. */
> rte_packet_prefetch((char *)first_seg->buf_addr +
> --
> 1.9.3
