From patchwork Mon Oct 31 02:14:20 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Linhaifeng <haifeng.lin@huawei.com>
X-Patchwork-Id: 16873
Return-Path: <dev-bounces@dpdk.org>
X-Original-To: patchwork@dpdk.org
Delivered-To: patchwork@dpdk.org
Received: from [92.243.14.124] (localhost [IPv6:::1])
	by dpdk.org (Postfix) with ESMTP id D60682BFA;
	Mon, 31 Oct 2016 03:15:04 +0100 (CET)
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [119.145.14.66])
	by dpdk.org (Postfix) with ESMTP id A9F0968F2
	for <dev@dpdk.org>; Mon, 31 Oct 2016 03:15:01 +0100 (CET)
Received: from 172.24.1.60 (EHLO szxeml427-hub.china.huawei.com)
	([172.24.1.60])
	by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued)
	with ESMTP id CKO23919; Mon, 31 Oct 2016 10:14:54 +0800 (CST)
Received: from [127.0.0.1] (10.177.20.223) by szxeml427-hub.china.huawei.com
	(10.82.67.182) with Microsoft SMTP Server id 14.3.235.1;
	Mon, 31 Oct 2016 10:14:51 +0800
To: "dev@dpdk.org" <dev@dpdk.org>, <declan.doherty@intel.com>
From: linhaifeng <haifeng.lin@huawei.com>
Message-ID: <5816A8FC.9070107@huawei.com>
Date: Mon, 31 Oct 2016 10:14:20 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
	Thunderbird/38.5.0
MIME-Version: 1.0
X-Originating-IP: [10.177.20.223]
X-CFilter-Loop: Reflected
Subject: [dpdk-dev] net/bonding: not handle vlan slow packet
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>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

if rx vlan offload is enable we should not handle vlan slow
packets too.

Signed-off-by: Haifeng Lin <haifeng.lin@huawei.com>

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 43334f7..6c74bba 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -169,7 +169,7 @@  bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 			/* Remove packet from array if it is slow packet or slave is not
 			 * in collecting state or bondign interface is not in promiscus
 			 * mode and packet address does not match. */
-			if (unlikely((hdr->ether_type == ether_type_slow_be ||
+			if (unlikely(((hdr->ether_type == ether_type_slow_be && !bufs[j]->vlan_tci) ||
 				!collecting || (!promisc &&
 					!is_multicast_ether_addr(&hdr->d_addr) &&
 					!is_same_ether_addr(&bond_mac, &hdr->d_addr))) &&