[dpdk-stable] patch 'net/hns3: fix DCB mode check' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.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 05/19/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/b3d3d36f92d2dca0dbf1271cfb681c60f156c87b

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From b3d3d36f92d2dca0dbf1271cfb681c60f156c87b Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Sat, 17 Apr 2021 17:54:56 +0800
Subject: [PATCH] net/hns3: fix DCB mode check

[ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ]

Currently, "ONLY DCB" and "DCB+RSS" mode are both supported by HNS3
PF driver. But the driver verifies only the "DCB+RSS" multiple queues
mode.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 5b60d1d2cc..1a775eba65 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2132,7 +2132,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)
 		return -EINVAL;
 	}
 
-	if (rx_mq_mode == ETH_MQ_RX_DCB_RSS) {
+	if (rx_mq_mode & ETH_MQ_RX_DCB_FLAG) {
 		if (dcb_rx_conf->nb_tcs > pf->tc_max) {
 			hns3_err(hw, "nb_tcs(%u) > max_tc(%u) driver supported.",
 				 dcb_rx_conf->nb_tcs, pf->tc_max);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:34.621757730 +0200
+++ 0133-net-hns3-fix-DCB-mode-check.patch	2021-05-17 17:40:29.391811209 +0200
@@ -1 +1 @@
-From edba2e32cbfd3747391031188c6a060ec8e70465 Mon Sep 17 00:00:00 2001
+From b3d3d36f92d2dca0dbf1271cfb681c60f156c87b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index eb9a340e69..f5dfa47ac1 100644
+index 5b60d1d2cc..1a775eba65 100644
@@ -23 +24 @@
-@@ -2239,7 +2239,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)
+@@ -2132,7 +2132,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)