[dpdk-stable] patch 'net/ice/base: fix return value' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/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 91525a17efb3b86a0c153bf9246f4e2a0214add3 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Mon, 15 Jun 2020 10:04:57 +0800
Subject: [PATCH] net/ice/base: fix return value

[ upstream commit 4f13a6735fd60587c9c6ae93414b6df01c833214 ]

Function ice_rem_adv_rule_id return incorrect error code (ICE_ERR_PARAM)
whereas it should have returned ICE_ERR_DOES_NOT_EXIST return code
if filter list is empty or unable to find "rule" in list

Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule")

Signed-off-by: Kiran Patil <kiran.patil at intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/base/ice_switch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 34d0a164e..72b04f84f 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -6487,7 +6487,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw,
 						list_itr->lkups_cnt, &rinfo);
 		}
 	}
-	return ICE_ERR_PARAM;
+	/* either list is empty or unable to find rule */
+	return ICE_ERR_DOES_NOT_EXIST;
 }
 
 /**
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:49.960154745 +0100
+++ 0035-net-ice-base-fix-return-value.patch	2020-07-24 12:53:48.239005565 +0100
@@ -1,14 +1,15 @@
-From 4f13a6735fd60587c9c6ae93414b6df01c833214 Mon Sep 17 00:00:00 2001
+From 91525a17efb3b86a0c153bf9246f4e2a0214add3 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Mon, 15 Jun 2020 10:04:57 +0800
 Subject: [PATCH] net/ice/base: fix return value
 
+[ upstream commit 4f13a6735fd60587c9c6ae93414b6df01c833214 ]
+
 Function ice_rem_adv_rule_id return incorrect error code (ICE_ERR_PARAM)
 whereas it should have returned ICE_ERR_DOES_NOT_EXIST return code
 if filter list is empty or unable to find "rule" in list
 
 Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kiran Patil <kiran.patil at intel.com>
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
-index 01dcace55..5c53b9ec3 100644
+index 34d0a164e..72b04f84f 100644
 --- a/drivers/net/ice/base/ice_switch.c
 +++ b/drivers/net/ice/base/ice_switch.c
-@@ -7661,7 +7661,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw,
+@@ -6487,7 +6487,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw,
  						list_itr->lkups_cnt, &rinfo);
  		}
  	}