From 47aa48b969f8db88de40ddf3121a45443a9db990 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Fri, 5 May 2017 00:36:13 +0200 Subject: [PATCH] net: fix stripped VLAN flag for offload emulation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Apply the new flag PKT_RX_VLAN_STRIPPED to the software emulation case (currently only for virtio and af_packet). Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN") Cc: stable@dpdk.org Signed-off-by: Michał Mirosław Signed-off-by: Thomas Monjalon Acked-by: Olivier Matz --- lib/librte_net/rte_ether.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index ff3d065400..5edf66c3f1 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -357,7 +357,7 @@ static inline int rte_vlan_strip(struct rte_mbuf *m) return -1; struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1); - m->ol_flags |= PKT_RX_VLAN_PKT; + m->ol_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED; m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci); /* Copy ether header over rather than moving whole packet */ @@ -407,6 +407,8 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) vh = (struct vlan_hdr *) (nh + 1); vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci); + (*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED; + return 0; } -- 2.20.1