From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH v2] net: fix stripped VLAN flag for offload emulation Date: Fri, 5 May 2017 00:36:13 +0200 Message-ID: <20170504223613.24431-1-thomas@monjalon.net> References: <20170504093041.503dcd8c@glumotte.dev.6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: dev@dpdk.org, olivier.matz@6wind.com, =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , stable@dpdk.org To: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Return-path: In-Reply-To: <20170504093041.503dcd8c@glumotte.dev.6wind.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Michał Mirosław 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 --- v2: add explanations and update rte_vlan_insert() --- 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 ff3d06540..5edf66c3f 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.12.2