patch 'net/hns3: fix warning on flush or destroy rule' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/28/23. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2

Thanks.

Kevin

---
>From c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 31 Jan 2023 21:02:58 +0800
Subject: [PATCH] net/hns3: fix warning on flush or destroy rule

[ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ]

Although flow rules will no longer be used when user flush all rules
or destroy a rule a warning is generated like:
"modified RSS types based on hardware support, requested:0x137f83fffc
configured:0x3ffc".

Prevent warning for flush or destroy rule case.

Fixes: ec674cb742e5 ("net/hns3: fix flushing RSS rule")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 5803406ef7..cc1a7f5eaa 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1493,15 +1493,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 	};
 
-	/* Filter the unsupported flow types */
-	flow_types = conf->conf.types ?
-		     rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
-		     hw->rss_info.conf.types;
-	if (flow_types != rss_flow_conf.types)
-		hns3_warn(hw, "modified RSS types based on hardware support, "
-			      "requested:0x%" PRIx64 " configured:0x%" PRIx64,
-			  rss_flow_conf.types, flow_types);
-	/* Update the useful flow types */
-	rss_flow_conf.types = flow_types;
-
 	if (!add) {
 		if (!conf->valid)
@@ -1529,4 +1518,15 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 	}
 
+	/* Filter the unsupported flow types */
+	flow_types = conf->conf.types ?
+		     rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
+		     hw->rss_info.conf.types;
+	if (flow_types != rss_flow_conf.types)
+		hns3_warn(hw, "modified RSS types based on hardware support,"
+			  " requested:0x%" PRIx64 " configured:0x%" PRIx64,
+			  rss_flow_conf.types, flow_types);
+	/* Update the useful flow types */
+	rss_flow_conf.types = flow_types;
+
 	/* Set hash algorithm and flow types by the user's config */
 	return hns3_hw_rss_hash_set(hw, &rss_flow_conf);
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.309717819 +0000
+++ 0062-net-hns3-fix-warning-on-flush-or-destroy-rule.patch	2023-02-23 14:46:23.811236109 +0000
@@ -1 +1 @@
-From a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd Mon Sep 17 00:00:00 2001
+From c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 3809fcc2d7..632247b846 100644
+index 5803406ef7..cc1a7f5eaa 100644
@@ -26 +27 @@
-@@ -1538,15 +1538,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1493,15 +1493,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
@@ -42 +43 @@
-@@ -1574,4 +1563,15 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1529,4 +1518,15 @@ hns3_config_rss_filter(struct hns3_hw *hw,