[dpdk-stable] patch 'net/bonding: fix Rx queue conversion' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 385e28cdf2d4c78db74c4cf0a2f73fa477212629 Mon Sep 17 00:00:00 2001
From: Dongsheng Rong <rongdongsheng at baidu.com>
Date: Tue, 22 Sep 2020 18:29:32 +0800
Subject: [PATCH] net/bonding: fix Rx queue conversion

[ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ]

In 'bond_ethdev_rx_burst_alb()' in Rx path, 'bond_rx_queue' should be
used, not 'bond_tx_queue'.

Fixes: 06fe78b98ccd ("bond: add mode 6")

Signed-off-by: Dongsheng Rong <rongdongsheng at baidu.com>
Signed-off-by: RongQing Li <lirongqing at baidu.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 178a39096b..e7cb418053 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -534,8 +534,8 @@ mode6_debug(const char __attribute__((unused)) *info,
 static uint16_t
 bond_ethdev_rx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 {
-	struct bond_tx_queue *bd_tx_q = (struct bond_tx_queue *)queue;
-	struct bond_dev_private *internals = bd_tx_q->dev_private;
+	struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue;
+	struct bond_dev_private *internals = bd_rx_q->dev_private;
 	struct rte_ether_hdr *eth_h;
 	uint16_t ether_type, offset;
 	uint16_t nb_recv_pkts;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.880289496 +0000
+++ 0166-net-bonding-fix-Rx-queue-conversion.patch	2020-10-28 10:35:11.772833968 +0000
@@ -1,13 +1,14 @@
-From 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 Mon Sep 17 00:00:00 2001
+From 385e28cdf2d4c78db74c4cf0a2f73fa477212629 Mon Sep 17 00:00:00 2001
 From: Dongsheng Rong <rongdongsheng at baidu.com>
 Date: Tue, 22 Sep 2020 18:29:32 +0800
 Subject: [PATCH] net/bonding: fix Rx queue conversion
 
+[ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ]
+
 In 'bond_ethdev_rx_burst_alb()' in Rx path, 'bond_rx_queue' should be
 used, not 'bond_tx_queue'.
 
 Fixes: 06fe78b98ccd ("bond: add mode 6")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dongsheng Rong <rongdongsheng at baidu.com>
 Signed-off-by: RongQing Li <lirongqing at baidu.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
-index 05ac25fcad..1c404b2edd 100644
+index 178a39096b..e7cb418053 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
-@@ -534,8 +534,8 @@ mode6_debug(const char __rte_unused *info,
+@@ -534,8 +534,8 @@ mode6_debug(const char __attribute__((unused)) *info,
  static uint16_t
  bond_ethdev_rx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
  {