From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 53369106A for ; Mon, 8 May 2017 07:44:20 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 07 May 2017 22:44:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,307,1491289200"; d="scan'208";a="83897560" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga002.jf.intel.com with ESMTP; 07 May 2017 22:44:18 -0700 From: Yuanhan Liu To: Cc: Yuanhan Liu , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Thomas Monjalon , Olivier Matz , dpdk stable Date: Mon, 8 May 2017 13:40:14 +0800 Message-Id: <1494222024-5222-2-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1494222024-5222-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1494222024-5222-1-git-send-email-yuanhan.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix stripped VLAN flag for offload emulation' has been queued to LTS release 16.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2017 05:44:20 -0000 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?= 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 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 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