From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <couyang@shecgisg004.sh.intel.com>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by dpdk.org (Postfix) with ESMTP id A10BF9AB4
for <dev@dpdk.org>; Mon, 9 Feb 2015 02:15:16 +0100 (CET)
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by fmsmga103.fm.intel.com with ESMTP; 08 Feb 2015 17:08:20 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.09,540,1418112000"; d="scan'208";a="674856224"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
by fmsmga002.fm.intel.com with ESMTP; 08 Feb 2015 17:15:14 -0800
Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com
[10.239.29.89])
by shvmail01.sh.intel.com with ESMTP id t191FClW019114;
Mon, 9 Feb 2015 09:15:12 +0800
Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1])
by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
t191F9QC011553; Mon, 9 Feb 2015 09:15:11 +0800
Received: (from couyang@localhost)
by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t191F9iK011549;
Mon, 9 Feb 2015 09:15:09 +0800
From: Ouyang Changchun <changchun.ouyang@intel.com>
To: dev@dpdk.org
Date: Mon, 9 Feb 2015 09:14:11 +0800
Message-Id: <1423444455-11330-23-git-send-email-changchun.ouyang@intel.com>
X-Mailer: git-send-email 1.7.12.2
In-Reply-To: <1423444455-11330-1-git-send-email-changchun.ouyang@intel.com>
References: <1422516249-14596-1-git-send-email-changchun.ouyang@intel.com>
<1423444455-11330-1-git-send-email-changchun.ouyang@intel.com>
Subject: [dpdk-dev] [PATCH v4 22/26] virtio: Use soft vlan strip in
mergeable Rx path
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 01:15:17 -0000
To keep the consistent logic with normal Rx path, the mergeable
Rx path also needs software vlan strip/decap if it is enabled.
Signed-off-by: Changchun Ouyang <changchun.ouyang@intel.com>
---
lib/librte_pmd_virtio/virtio_rxtx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/librte_pmd_virtio/virtio_rxtx.c b/lib/librte_pmd_virtio/virtio_rxtx.c
index a82e8eb..c6d9ae7 100644
--- a/lib/librte_pmd_virtio/virtio_rxtx.c
+++ b/lib/librte_pmd_virtio/virtio_rxtx.c
@@ -568,6 +568,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,
uint16_t nb_pkts)
{
struct virtqueue *rxvq = rx_queue;
+ struct virtio_hw *hw = rxvq->hw;
struct rte_mbuf *rxm, *new_mbuf;
uint16_t nb_used, num, nb_rx = 0;
uint32_t len[VIRTIO_MBUF_BURST_SZ];
@@ -674,6 +675,9 @@ virtio_recv_mergeable_pkts(void *rx_queue,
seg_res -= rcv_cnt;
}
+ if (hw->vlan_strip)
+ rte_vlan_strip(rx_pkts[nb_rx]);
+
VIRTIO_DUMP_PACKET(rx_pkts[nb_rx],
rx_pkts[nb_rx]->data_len);
--
1.8.4.2