[dpdk-stable] patch 'net: fix stripped VLAN flag for offload emulation' has been queued to LTS release 16.11.2
Yuanhan Liu
yuanhan.liu at linux.intel.com
Mon May 8 07:40:14 CEST 2017
Hi,
FYI, your patch has been queued to LTS release 16.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable
yet. It will be pushed if I get no objections before 05/13/17.
So please shout if anyone has objections.
Thanks.
--yliu
---
>From 1223e6395e15382dcc8c3c4813143f940fb87f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?=
<michal.miroslaw at atendesoftware.pl>
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=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 47aa48b969f8db88de40ddf3121a45443a9db990 ]
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")
Signed-off-by: Michał Mirosław <michal.miroslaw at atendesoftware.pl>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
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 ff3d065..5edf66c 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;
}
--
1.9.0
More information about the stable
mailing list