[dpdk-stable] patch 'net/hns3: remove MPLS from supported flow items' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/10/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/73d183306dc9c1666dd729e9b2a2a69b98b71d6e

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 73d183306dc9c1666dd729e9b2a2a69b98b71d6e Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Wed, 3 Feb 2021 20:23:51 +0800
Subject: [PATCH] net/hns3: remove MPLS from supported flow items

[ upstream commit e9550856f8c65b6e15f8f59810560bc6d240a1f8 ]

The Kunpeng920 and Kunpeng930 don't support parse MPLS packet, so
remove the type from supported flow items.

Fixes: fcba820d9b9e ("net/hns3: support flow director")

Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
Signed-off-by: Lijun Ou <oulijun at huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 3f4d9dbfe6..2147da73cd 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -46,8 +46,7 @@ static enum rte_flow_item_type first_items[] = {
 	RTE_FLOW_ITEM_TYPE_NVGRE,
 	RTE_FLOW_ITEM_TYPE_VXLAN,
 	RTE_FLOW_ITEM_TYPE_GENEVE,
-	RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
-	RTE_FLOW_ITEM_TYPE_MPLS
+	RTE_FLOW_ITEM_TYPE_VXLAN_GPE
 };
 
 static enum rte_flow_item_type L2_next_items[] = {
@@ -67,8 +66,7 @@ static enum rte_flow_item_type L3_next_items[] = {
 static enum rte_flow_item_type L4_next_items[] = {
 	RTE_FLOW_ITEM_TYPE_VXLAN,
 	RTE_FLOW_ITEM_TYPE_GENEVE,
-	RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
-	RTE_FLOW_ITEM_TYPE_MPLS
+	RTE_FLOW_ITEM_TYPE_VXLAN_GPE
 };
 
 static enum rte_flow_item_type tunnel_next_items[] = {
@@ -1059,8 +1057,7 @@ is_tunnel_packet(enum rte_flow_item_type type)
 	if (type == RTE_FLOW_ITEM_TYPE_VXLAN_GPE ||
 	    type == RTE_FLOW_ITEM_TYPE_VXLAN ||
 	    type == RTE_FLOW_ITEM_TYPE_NVGRE ||
-	    type == RTE_FLOW_ITEM_TYPE_GENEVE ||
-	    type == RTE_FLOW_ITEM_TYPE_MPLS)
+	    type == RTE_FLOW_ITEM_TYPE_GENEVE)
 		return true;
 	return false;
 }
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-08 12:04:29.850193591 +0100
+++ 0008-net-hns3-remove-MPLS-from-supported-flow-items.patch	2021-02-08 12:04:29.535496792 +0100
@@ -1 +1 @@
-From e9550856f8c65b6e15f8f59810560bc6d240a1f8 Mon Sep 17 00:00:00 2001
+From 73d183306dc9c1666dd729e9b2a2a69b98b71d6e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e9550856f8c65b6e15f8f59810560bc6d240a1f8 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index a6011245c5..c484114b32 100644
+index 3f4d9dbfe6..2147da73cd 100644
@@ -22 +23 @@
-@@ -44,8 +44,7 @@ static enum rte_flow_item_type first_items[] = {
+@@ -46,8 +46,7 @@ static enum rte_flow_item_type first_items[] = {
@@ -32 +33 @@
-@@ -65,8 +64,7 @@ static enum rte_flow_item_type L3_next_items[] = {
+@@ -67,8 +66,7 @@ static enum rte_flow_item_type L3_next_items[] = {
@@ -42 +43 @@
-@@ -1118,8 +1116,7 @@ is_tunnel_packet(enum rte_flow_item_type type)
+@@ -1059,8 +1057,7 @@ is_tunnel_packet(enum rte_flow_item_type type)