From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 658F5548B for ; Tue, 20 Nov 2018 20:14:30 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2AA2369CE; Tue, 20 Nov 2018 19:14:29 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FF3460141; Tue, 20 Nov 2018 19:14:28 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Chas Williams , dpdk stable Date: Tue, 20 Nov 2018 19:11:57 +0000 Message-Id: <20181120191252.30277-7-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 20 Nov 2018 19:14:29 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bonding: support matching QinQ ethertype' has been queued to stable release 18.08.1 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: Tue, 20 Nov 2018 19:14:30 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From c33339ca9652a2c702fd52b343d660d5c85c465e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Aug 2018 16:10:46 +0800 Subject: [PATCH] net/bonding: support matching QinQ ethertype [ upstream commit 763e450ae24d88b87f1eb86643a2897b141d9c07 ] We assume VLAN ethtertype is 0x8100 in get_vlan_offset() function, but it could be 0x88A8 if QinQ is supported. Fixes: 06fe78b98ccd ("bond: add mode 6") Signed-off-by: Yunjian Wang Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 58f7377c6..441742258 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -38,5 +38,6 @@ get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto) size_t vlan_offset = 0; - if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto) { + if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto || + rte_cpu_to_be_16(ETHER_TYPE_QINQ) == *proto) { struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:07.640817490 +0000 +++ 0007-net-bonding-support-matching-QinQ-ethertype.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,13 +1,14 @@ -From 763e450ae24d88b87f1eb86643a2897b141d9c07 Mon Sep 17 00:00:00 2001 +From c33339ca9652a2c702fd52b343d660d5c85c465e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Aug 2018 16:10:46 +0800 Subject: [PATCH] net/bonding: support matching QinQ ethertype +[ upstream commit 763e450ae24d88b87f1eb86643a2897b141d9c07 ] + We assume VLAN ethtertype is 0x8100 in get_vlan_offset() function, but it could be 0x88A8 if QinQ is supported. Fixes: 06fe78b98ccd ("bond: add mode 6") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Chas Williams