[dpdk-stable] patch 'net/ice: fix error log in generic flow' 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 5d3bcbcebf981afc683e0138e78aaadefb11f38c Mon Sep 17 00:00:00 2001
From: Shougang Wang <shougangx.wang at intel.com>
Date: Mon, 6 Jul 2020 09:37:05 +0000
Subject: [PATCH] net/ice: fix error log in generic flow

[ upstream commit c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 ]

When create a RSS rule with void action, the error log is "Invalid
input set". This patch fix the issue by adding check for the type of
first actions item.

Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")

Signed-off-by: Shougang Wang <shougangx.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_generic_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index a1648eeb5..1d2d60fda 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1786,7 +1786,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
-	if (!actions) {
+	if (!actions || actions->type == RTE_FLOW_ACTION_TYPE_END) {
 		rte_flow_error_set(error, EINVAL,
 				   RTE_FLOW_ERROR_TYPE_ACTION_NUM,
 				   NULL, "NULL action.");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.082275100 +0100
+++ 0118-net-ice-fix-error-log-in-generic-flow.patch	2020-07-24 12:53:48.395008472 +0100
@@ -1,14 +1,15 @@
-From c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 Mon Sep 17 00:00:00 2001
+From 5d3bcbcebf981afc683e0138e78aaadefb11f38c Mon Sep 17 00:00:00 2001
 From: Shougang Wang <shougangx.wang at intel.com>
 Date: Mon, 6 Jul 2020 09:37:05 +0000
 Subject: [PATCH] net/ice: fix error log in generic flow
 
+[ upstream commit c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 ]
+
 When create a RSS rule with void action, the error log is "Invalid
 input set". This patch fix the issue by adding check for the type of
 first actions item.
 
 Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shougang Wang <shougangx.wang at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
-index ad103d0e8..80ef0e323 100644
+index a1648eeb5..1d2d60fda 100644
 --- a/drivers/net/ice/ice_generic_flow.c
 +++ b/drivers/net/ice/ice_generic_flow.c
-@@ -1873,7 +1873,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
+@@ -1786,7 +1786,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
  		return -rte_errno;
  	}