From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id DBDD02A66 for ; Sun, 22 Apr 2018 17:12:11 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2F2D820E8C; Sun, 22 Apr 2018 11:12:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:12:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=e5d5kwoM3P1Tp4q2b Lld28LBHmfNye6GsCUASLCkQmk=; b=ZVXySXe8GtztwZtcVYZ1gYrux4p5LbZ2y k55jiEF2W9mKW/v1+5Q+5gju/T2NIXnknq+PcvdFAKWrdo2aC5Im0MvCpqiMx88R qK7dxzqSyefXPSHEPswSBwydwAFvRXVsSKPmOMwY0kkdFey3S0TnBVBSMAaD38We KBUBJcKZTYCHoTsfL4C6iOr7dlh7+IvqC+JGg1n6JKQQnumrfMa+MFvffz+q7KuF cB3rFehVgBV5/+DcIaWzK+Tb5V/uq+p/FlnP2RrTTbn8E0P2wM3a0K7YP9MMfCZM P+o42PZkM6irvi482V2b0LmjZfV+WXYRsocmsP8wEHX30dLAbaIgg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=e5d5kwoM3P1Tp4q2bLld28LBHmfNye6GsCUASLCkQmk=; b=bGzUgo+i hw2dF8AB6MFwXxMPPOPE8fzjjpvxSBr+zQxKyZ+JjRofjlPxablQrwE8jxLWRztz Qm0ZqvfDUM3goOs1HbzfbK0fc3hnjmfqFtXtcuHavlMpV+wIUzVSBNBaX6aCYqZc n7Mc9K3fh8pXL+Hgz6SWwIzZpz616FNj/pb5rpmTLacIcpyVH3ucz+zuPRjlOb3+ dBkWW/jaKRkTDYyeI8BMcrQ6/EvrEnidwK1tg36KSEo6EDHtfVvbayQSPMxJUikr whSCJBbdnK7WPAwyEE+rimGjxR/9RB7of561KbbH80sZZ6edOK9kMfVWXx2wP944 YAhrDmowc4+ZMg== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 22B731025D; Sun, 22 Apr 2018 11:12:08 -0400 (EDT) From: Yuanhan Liu To: Chas Williams Cc: Radu Nicolau , dpdk stable Date: Sun, 22 Apr 2018 23:09:38 +0800 Message-Id: <20180422150949.17523-48-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/bonding: fix setting VLAN ID on slave ports' has been queued to LTS release 17.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: Sun, 22 Apr 2018 15:12:12 -0000 Hi, FYI, your patch has been queued to LTS release 17.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 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 824d1367ee29c2b0a9376e2c8f652610b1316866 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Tue, 3 Apr 2018 12:01:22 -0400 Subject: [PATCH] net/bonding: fix setting VLAN ID on slave ports [ upstream commit 3639903f488976e61752103bed546d5b87147ad0 ] The pos returned is just the offset of the slab. You need to use this to offset the bits in the slab. Fixes: c771e4ef38 ("net/bonding: enable slave VLAN filter") Signed-off-by: Chas Williams Acked-by: Radu Nicolau --- drivers/net/bonding/rte_eth_bond_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index b83403566..8fd90ae9f 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -240,9 +240,12 @@ slave_vlan_filter_set(uint16_t bonded_port_id, uint16_t slave_port_id) for (i = 0, mask = 1; i < RTE_BITMAP_SLAB_BIT_SIZE; i ++, mask <<= 1) { - if (unlikely(slab & mask)) + if (unlikely(slab & mask)) { + uint16_t vlan_id = pos + i; + res = rte_eth_dev_vlan_filter(slave_port_id, - (uint16_t)pos, 1); + vlan_id, 1); + } } found = rte_bitmap_scan(internals->vlan_filter_bmp, &pos, &slab); -- 2.11.0