[dpdk-stable] patch 'net/bnxt: fix queue get info' 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 aca542737a31ca9fed96300d31e1d01810e86513 Mon Sep 17 00:00:00 2001
From: Lance Richardson <lance.richardson at broadcom.com>
Date: Tue, 22 Sep 2020 13:30:35 -0400
Subject: [PATCH] net/bnxt: fix queue get info

[ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ]

Return current offloads in rxq_info_get()/txq_info_get().

Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information")

Signed-off-by: Lance Richardson <lance.richardson at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e219dbf0d0..c6e9ad8e6a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2205,6 +2205,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
 	qinfo->conf.rx_drop_en = rxq->drop_en;
 	qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+	qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads;
 }
 
 static void
@@ -2228,6 +2229,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->conf.tx_free_thresh = txq->tx_free_thresh;
 	qinfo->conf.tx_rs_thresh = 0;
 	qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+	qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads;
 }
 
 int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:14.071513227 +0000
+++ 0074-net-bnxt-fix-queue-get-info.patch	2020-10-28 10:35:11.576831083 +0000
@@ -1,12 +1,13 @@
-From bd6345e4f48a737ec498d013953e785ab185e5f1 Mon Sep 17 00:00:00 2001
+From aca542737a31ca9fed96300d31e1d01810e86513 Mon Sep 17 00:00:00 2001
 From: Lance Richardson <lance.richardson at broadcom.com>
 Date: Tue, 22 Sep 2020 13:30:35 -0400
 Subject: [PATCH] net/bnxt: fix queue get info
 
+[ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ]
+
 Return current offloads in rxq_info_get()/txq_info_get().
 
 Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information")
-Cc: stable at dpdk.org
 
 Signed-off-by: Lance Richardson <lance.richardson at broadcom.com>
 Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index d0d11a6d0e..bb6b25dff2 100644
+index e219dbf0d0..c6e9ad8e6a 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -2645,6 +2645,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -2205,6 +2205,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
  	qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
  	qinfo->conf.rx_drop_en = rxq->drop_en;
  	qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
@@ -27,14 +28,14 @@
  }
  
  static void
-@@ -2668,6 +2669,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
+@@ -2228,6 +2229,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
  	qinfo->conf.tx_free_thresh = txq->tx_free_thresh;
  	qinfo->conf.tx_rs_thresh = 0;
  	qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
 +	qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads;
  }
  
- static const struct {
+ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 -- 
 2.20.1