[dpdk-stable] patch 'net/ice: fix switch action number check' 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 47be9745de536a89775543f98112b600f9653d95 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Thu, 21 May 2020 15:34:11 +0800
Subject: [PATCH] net/ice: fix switch action number check

[ upstream commit 59d3870c7facace93db794a37e136d4a9f6ef0a3 ]

The action number for switch filter should be 1, any
other such as 0 or more than 1 is invalid.

Fixes: 3428c6b6ec1f ("net/ice: add action number check for switch")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Tested-by: Qimai Xiao <qimaix.xiao at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_switch_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 6c2473163..b00ac2abe 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1028,7 +1028,7 @@ ice_switch_check_action(const struct rte_flow_action *actions,
 		}
 	}
 
-	if (actions_num > 1) {
+	if (actions_num != 1) {
 		rte_flow_error_set(error,
 				   EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
 				   actions,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:48.667982112 +0100
+++ 0002-net-ice-fix-switch-action-number-check.patch	2020-07-24 12:53:48.131003553 +0100
@@ -1,13 +1,14 @@
-From 59d3870c7facace93db794a37e136d4a9f6ef0a3 Mon Sep 17 00:00:00 2001
+From 47be9745de536a89775543f98112b600f9653d95 Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Thu, 21 May 2020 15:34:11 +0800
 Subject: [PATCH] net/ice: fix switch action number check
 
+[ upstream commit 59d3870c7facace93db794a37e136d4a9f6ef0a3 ]
+
 The action number for switch filter should be 1, any
 other such as 0 or more than 1 is invalid.
 
 Fixes: 3428c6b6ec1f ("net/ice: add action number check for switch")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Tested-by: Qimai Xiao <qimaix.xiao at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
-index dd3f4847a..20e8187d3 100644
+index 6c2473163..b00ac2abe 100644
 --- a/drivers/net/ice/ice_switch_filter.c
 +++ b/drivers/net/ice/ice_switch_filter.c
-@@ -1388,7 +1388,7 @@ ice_switch_check_action(const struct rte_flow_action *actions,
+@@ -1028,7 +1028,7 @@ ice_switch_check_action(const struct rte_flow_action *actions,
  		}
  	}