[dpdk-stable] patch 'net/ice: change default tunnel type' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/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 1b23b24565c49869d9a750633a0dd96bb95f33ff Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Fri, 3 Apr 2020 12:46:01 +0800
Subject: [PATCH] net/ice: change default tunnel type

[ upstream commit 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 ]

The default tunnel type for switch filter change to new
definition of ICE_SW_TUN_AND_NON_TUN in order that the rule
will be apply to more packet type.

Fixes: 47d460d63233 ("net/ice: rework switch filter")

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

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 66dc158efc..1db3db43c2 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1015,7 +1015,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
 	uint16_t lkups_num = 0;
 	const struct rte_flow_item *item = pattern;
 	uint16_t item_num = 0;
-	enum ice_sw_tunnel_type tun_type = ICE_NON_TUN;
+	enum ice_sw_tunnel_type tun_type =
+		ICE_SW_TUN_AND_NON_TUN;
 	struct ice_pattern_match_item *pattern_match_item = NULL;
 
 	for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:46.160608286 +0100
+++ 0039-net-ice-change-default-tunnel-type.patch	2020-05-19 14:04:44.176647647 +0100
@@ -1,14 +1,15 @@
-From 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 Mon Sep 17 00:00:00 2001
+From 1b23b24565c49869d9a750633a0dd96bb95f33ff Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Fri, 3 Apr 2020 12:46:01 +0800
 Subject: [PATCH] net/ice: change default tunnel type
 
+[ upstream commit 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 ]
+
 The default tunnel type for switch filter change to new
 definition of ICE_SW_TUN_AND_NON_TUN in order that the rule
 will be apply to more packet type.
 
 Fixes: 47d460d63233 ("net/ice: rework switch filter")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
-index ed02d9805c..d9bdf9637e 100644
+index 66dc158efc..1db3db43c2 100644
 --- a/drivers/net/ice/ice_switch_filter.c
 +++ b/drivers/net/ice/ice_switch_filter.c
-@@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
+@@ -1015,7 +1015,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
  	uint16_t lkups_num = 0;
  	const struct rte_flow_item *item = pattern;
  	uint16_t item_num = 0;