From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id E21C81B107 for ; Thu, 27 Sep 2018 10:44:13 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id y8-v6so1634075wrh.7 for ; Thu, 27 Sep 2018 01:44:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fa2Xafht9im8gQZyjJJsoz0EHU6yqoT+eq8+qQWgEog=; b=ArZqTUyUAO0Cu2hE55OhMRJt9KaiEGIYYTFE23vEROlq7bWETqfBEdFJ8jTJCNECXT pgKM/spO9QMo6XujE/onEiDnXEzm0OCYalE6ryvTtsMkHwgJl/UO8RAyhwSLd4Fj/j8C AXVvblwHQW/bEGqODXWDwF4rSECvDauS0aQ+x0JWdCvT3EjlsMc93zrwo49LzGIaYtF1 vGpjeDb9NwRo1+v216pHhshUOmYCkht6w7HKFHXQaG/q4PPzFA4FO2d5oz+QlS9JMO4S znEULctoIqqp51yYdWKumhHG/A72pz1O8q766oVnMRxyBhjRYoA9uadhmA11L2ZUXmyf mSIQ== X-Gm-Message-State: ABuFfoiV+3e9kTwkMv4rVqr4rjs9VLjrP2j0KX43oR/p+9RP00Fc7+XO 6lqIsX6zciN/z9J+gLHnWEY= X-Google-Smtp-Source: ACcGV61ITXvU1If1UaQCSfnUXNlLJFawCVfbEO5W9Hiz8ksYOyZZuEv1KQqrrD9Z2rWs+sSVkLIaRw== X-Received: by 2002:a5d:42ca:: with SMTP id t10-v6mr4828543wrr.104.1538037853498; Thu, 27 Sep 2018 01:44:13 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id h18-v6sm1030316wrb.82.2018.09.27.01.44.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 01:44:12 -0700 (PDT) From: Luca Boccassi To: Yunjian Wang Cc: Chas Williams , dpdk stable Date: Thu, 27 Sep 2018 09:43:56 +0100 Message-Id: <20180927084403.19646-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-stable] patch 'net/bonding: support matching QinQ ethertype' has been queued to LTS release 16.11.9 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, 27 Sep 2018 08:44:14 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/27/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. Luca Boccassi --- >>From ef681bd47d7fdd3000e904d131f8aafde934eba8 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 6081918e79..60f9e1ab11 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -62,7 +62,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.18.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-09-25 13:26:56.807025572 +0100 +++ 0001-net-bonding-support-matching-QinQ-ethertype.patch 2018-09-25 13:26:56.763424697 +0100 @@ -1,13 +1,14 @@ -From 763e450ae24d88b87f1eb86643a2897b141d9c07 Mon Sep 17 00:00:00 2001 +From ef681bd47d7fdd3000e904d131f8aafde934eba8 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 58f7377c60..4417422581 100644 +index 6081918e79..60f9e1ab11 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) +@@ -62,7 +62,8 @@ get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto) { size_t vlan_offset = 0;