[dpdk-stable] patch 'net/ice: fix RSS hash update' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/7b7af2fd73148dc8e98f870676aa4d8d4548b923

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 7b7af2fd73148dc8e98f870676aa4d8d4548b923 Mon Sep 17 00:00:00 2001
From: Wenjun Wu <wenjun1.wu at intel.com>
Date: Fri, 5 Mar 2021 14:03:24 +0800
Subject: [PATCH] net/ice: fix RSS hash update
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 962fa026889d83f5f0a6880a98d050e0c3e0f6b9 ]

This patch change judgment statements to disable RSS for pf
when users need to disable RSS or RSS hash function configured
is not supported.

Fixes: 4717a12cfaf1 ("net/ice: initialize and update RSS based on user config")

Signed-off-by: Wenjun Wu <wenjun1.wu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 626ebfac5b..f4874632cd 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -4394,8 +4394,10 @@ ice_rss_hash_update(struct rte_eth_dev *dev,
 	if (status)
 		return status;
 
-	if (rss_conf->rss_hf == 0)
+	if (rss_conf->rss_hf == 0) {
+		pf->rss_hf = 0;
 		return 0;
+	}
 
 	/* RSS hash configuration */
 	ice_rss_hash_set(pf, rss_conf->rss_hf);
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:29.209223900 +0800
+++ 0101-net-ice-fix-RSS-hash-update.patch	2021-05-10 23:59:26.480000000 +0800
@@ -1 +1 @@
-From 962fa026889d83f5f0a6880a98d050e0c3e0f6b9 Mon Sep 17 00:00:00 2001
+From 7b7af2fd73148dc8e98f870676aa4d8d4548b923 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 962fa026889d83f5f0a6880a98d050e0c3e0f6b9 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 9c9b84a938..5a1190d50e 100644
+index 626ebfac5b..f4874632cd 100644
@@ -23 +25 @@
-@@ -4457,8 +4457,10 @@ ice_rss_hash_update(struct rte_eth_dev *dev,
+@@ -4394,8 +4394,10 @@ ice_rss_hash_update(struct rte_eth_dev *dev,