[dpdk-stable] patch 'net/octeontx2: fix getting supported packet types' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

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/13/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 a691fd0281c5683c39b19df1bc9a9d6df0ac6aaf Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra at marvell.com>
Date: Thu, 12 Dec 2019 17:58:56 +0000
Subject: [PATCH] net/octeontx2: fix getting supported packet types

[ upstream commit 348123a3df8c679b2fcf56ec767c2bc319ec8bf9 ]

Setting up supported ptypes using testpmd command is failing
because supported_ptypes_get callback will never return ptypes
supported, as NIX_RX_OFFLOAD_PTYPE_F bit in rx_offload_flags
is zero by default in testpmd.

Fixes: d2706e15e6fb ("net/octeontx2: support reduced set of packet types")

Signed-off-by: Harman Kalra <hkalra at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_lookup.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_lookup.c b/drivers/net/octeontx2/otx2_lookup.c
index bcf2ff4e8f..5685571166 100644
--- a/drivers/net/octeontx2/otx2_lookup.c
+++ b/drivers/net/octeontx2/otx2_lookup.c
@@ -17,7 +17,7 @@
 const uint32_t *
 otx2_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev)
 {
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+	RTE_SET_USED(eth_dev);
 
 	static const uint32_t ptypes[] = {
 		RTE_PTYPE_L2_ETHER_QINQ, /* LB */
@@ -56,10 +56,7 @@ otx2_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev)
 		RTE_PTYPE_UNKNOWN,
 	};
 
-	if (dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)
-		return ptypes;
-	else
-		return NULL;
+	return ptypes;
 }
 
 int
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:41.340359542 +0000
+++ 0067-net-octeontx2-fix-getting-supported-packet-types.patch	2020-02-11 11:17:38.460002469 +0000
@@ -1,15 +1,16 @@
-From 348123a3df8c679b2fcf56ec767c2bc319ec8bf9 Mon Sep 17 00:00:00 2001
+From a691fd0281c5683c39b19df1bc9a9d6df0ac6aaf Mon Sep 17 00:00:00 2001
 From: Harman Kalra <hkalra at marvell.com>
 Date: Thu, 12 Dec 2019 17:58:56 +0000
 Subject: [PATCH] net/octeontx2: fix getting supported packet types
 
+[ upstream commit 348123a3df8c679b2fcf56ec767c2bc319ec8bf9 ]
+
 Setting up supported ptypes using testpmd command is failing
 because supported_ptypes_get callback will never return ptypes
 supported, as NIX_RX_OFFLOAD_PTYPE_F bit in rx_offload_flags
 is zero by default in testpmd.
 
 Fixes: d2706e15e6fb ("net/octeontx2: support reduced set of packet types")
-Cc: stable at dpdk.org
 
 Signed-off-by: Harman Kalra <hkalra at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>