[dpdk-stable] patch 'net/ice: fix input set of VLAN item' 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 39e690ab3b1a2b823b39d7868cbbad8cf41cc110 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Fri, 3 Apr 2020 12:46:07 +0800
Subject: [PATCH] net/ice: fix input set of VLAN item

[ upstream commit 5d834926034f311caf3eabc685691cb9cb803f32 ]

The input set for inner type of vlan item should
be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER.
This mac vlan filter is also part of DCF switch filter.

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 | 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 0d88e0bd7e..1d91d773ec 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -871,7 +871,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
 						vlan_spec->inner_type;
 					list[t].m_u.vlan_hdr.type =
 						UINT16_MAX;
-					input_set |= ICE_INSET_VLAN_OUTER;
+					input_set |= ICE_INSET_ETHERTYPE;
 				}
 				t++;
 			} else if (!vlan_spec && !vlan_mask) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:46.233846675 +0100
+++ 0041-net-ice-fix-input-set-of-VLAN-item.patch	2020-05-19 14:04:44.176647647 +0100
@@ -1,14 +1,15 @@
-From 5d834926034f311caf3eabc685691cb9cb803f32 Mon Sep 17 00:00:00 2001
+From 39e690ab3b1a2b823b39d7868cbbad8cf41cc110 Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Fri, 3 Apr 2020 12:46:07 +0800
 Subject: [PATCH] net/ice: fix input set of VLAN item
 
+[ upstream commit 5d834926034f311caf3eabc685691cb9cb803f32 ]
+
 The input set for inner type of vlan item should
 be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER.
 This mac vlan filter is also part of DCF switch filter.
 
 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,18 +18,18 @@
  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 81d069e995..686f9c3e3d 100644
+index 0d88e0bd7e..1d91d773ec 100644
 --- a/drivers/net/ice/ice_switch_filter.c
 +++ b/drivers/net/ice/ice_switch_filter.c
-@@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
+@@ -871,7 +871,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
  						vlan_spec->inner_type;
  					list[t].m_u.vlan_hdr.type =
- 						vlan_mask->inner_type;
+ 						UINT16_MAX;
 -					input_set |= ICE_INSET_VLAN_OUTER;
 +					input_set |= ICE_INSET_ETHERTYPE;
  				}
  				t++;
- 			}
+ 			} else if (!vlan_spec && !vlan_mask) {
 -- 
 2.20.1