[dpdk-stable] patch 'net/i40e: remove duplicate tunnel type check' has been queued to stable release 19.11.4

[luca.boccassi@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 08/08/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 70b07433d86e926422e1f1c24e3925c4ddb3f01d Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gaurav1086@gmail.com>
Date: Fri, 31 Jul 2020 21:57:52 -0400
Subject: [PATCH] net/i40e: remove duplicate tunnel type check

[ upstream commit 8716f9942a408a79a114ac0496e4e7d55bc9944c ]

remove duplicate check

Fixes: 62e94f7f66fb ("net/i40e: configure packet type mapping")

Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index fdcb1a43e..759c370d7 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -2169,7 +2169,6 @@ static int check_invalid_pkt_type(uint32_t pkt_type)
 	    tnl != RTE_PTYPE_TUNNEL_VXLAN &&
 	    tnl != RTE_PTYPE_TUNNEL_NVGRE &&
 	    tnl != RTE_PTYPE_TUNNEL_GENEVE &&
-	    tnl != RTE_PTYPE_TUNNEL_GRENAT &&
 	    tnl != RTE_PTYPE_TUNNEL_GTPC &&
 	    tnl != RTE_PTYPE_TUNNEL_GTPU &&
 	    tnl != RTE_PTYPE_TUNNEL_L2TP)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.369734033 +0100
+++ 0041-net-i40e-remove-duplicate-tunnel-type-check.patch	2020-08-06 10:53:15.836598114 +0100
@@ -1,12 +1,13 @@
-From 8716f9942a408a79a114ac0496e4e7d55bc9944c Mon Sep 17 00:00:00 2001
+From 70b07433d86e926422e1f1c24e3925c4ddb3f01d Mon Sep 17 00:00:00 2001
 From: Gaurav Singh <gaurav1086@gmail.com>
 Date: Fri, 31 Jul 2020 21:57:52 -0400
 Subject: [PATCH] net/i40e: remove duplicate tunnel type check
 
+[ upstream commit 8716f9942a408a79a114ac0496e4e7d55bc9944c ]
+
 remove duplicate check
 
 Fixes: 62e94f7f66fb ("net/i40e: configure packet type mapping")
-Cc: stable@dpdk.org
 
 Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
@@ -15,7 +16,7 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
-index e216e6783..17938e7d3 100644
+index fdcb1a43e..759c370d7 100644
 --- a/drivers/net/i40e/rte_pmd_i40e.c
 +++ b/drivers/net/i40e/rte_pmd_i40e.c
 @@ -2169,7 +2169,6 @@ static int check_invalid_pkt_type(uint32_t pkt_type)
@@ -25,7 +26,7 @@
 -	    tnl != RTE_PTYPE_TUNNEL_GRENAT &&
  	    tnl != RTE_PTYPE_TUNNEL_GTPC &&
  	    tnl != RTE_PTYPE_TUNNEL_GTPU &&
- 	    tnl != RTE_PTYPE_TUNNEL_L2TP &&
+ 	    tnl != RTE_PTYPE_TUNNEL_L2TP)
 -- 
 2.20.1