From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 6BFC61B512 for ; Fri, 30 Nov 2018 00:12:45 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:18:37 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW76032075; Fri, 30 Nov 2018 01:12:42 +0200 From: Yongseok Koh To: Yunjian Wang Cc: Chas Williams , dpdk stable Date: Thu, 29 Nov 2018 15:10:00 -0800 Message-Id: <20181129231202.30436-6-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/bonding: support matching QinQ ethertype' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:12:45 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From a018f8ab816ad9b91833cacb13c7ed9a95ae7785 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 8880231ea..15da5185e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -64,7 +64,8 @@ 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); vlan_offset = sizeof(struct vlan_hdr); -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:45.570682860 -0800 +++ 0006-net-bonding-support-matching-QinQ-ethertype.patch 2018-11-29 15:01:44.969961000 -0800 @@ -1,13 +1,14 @@ -From 763e450ae24d88b87f1eb86643a2897b141d9c07 Mon Sep 17 00:00:00 2001 +From a018f8ab816ad9b91833cacb13c7ed9a95ae7785 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 @@ -16,10 +17,10 @@ 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 +index 8880231ea..15da5185e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -37,7 +37,8 @@ get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto) +@@ -64,7 +64,8 @@ get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto) { size_t vlan_offset = 0;