[dpdk-stable] patch 'net/i40e: remove empty queue stats mapping set devops' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 06/27/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/131c8023818db00b93c1da233357df74006320f1

Thanks.

Kevin Traynor

---
From 131c8023818db00b93c1da233357df74006320f1 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 28 May 2019 12:43:18 -0700
Subject: [PATCH] net/i40e: remove empty queue stats mapping set devops

[ upstream commit fe1d9ecb304e3e869acbbac00bc855fd25751b1b ]

This driver was inserting its own stub for queue_stats_mapping which
did nothing but cause this device to return a different errno
than every other device driver.  All devices that don't implement
queue stats mapping should return the same error.

Maybe the plan originally was to implement something, if that
ever happens, just put in the right code.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/i40e/i40e_ethdev.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 74f111e64..d419c0cf0 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -239,8 +239,4 @@ static int i40e_dev_xstats_get_names(struct rte_eth_dev *dev,
 				     unsigned limit);
 static void i40e_dev_stats_reset(struct rte_eth_dev *dev);
-static int i40e_dev_queue_stats_mapping_set(struct rte_eth_dev *dev,
-					    uint16_t queue_id,
-					    uint8_t stat_idx,
-					    uint8_t is_rx);
 static int i40e_fw_version_get(struct rte_eth_dev *dev,
 				char *fw_version, size_t fw_size);
@@ -456,5 +452,4 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
 	.stats_reset                  = i40e_dev_stats_reset,
 	.xstats_reset                 = i40e_dev_stats_reset,
-	.queue_stats_mapping_set      = i40e_dev_queue_stats_mapping_set,
 	.fw_version_get               = i40e_fw_version_get,
 	.dev_infos_get                = i40e_dev_info_get,
@@ -3429,15 +3424,4 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
 }
 
-static int
-i40e_dev_queue_stats_mapping_set(__rte_unused struct rte_eth_dev *dev,
-				 __rte_unused uint16_t queue_id,
-				 __rte_unused uint8_t stat_idx,
-				 __rte_unused uint8_t is_rx)
-{
-	PMD_INIT_FUNC_TRACE();
-
-	return -ENOSYS;
-}
-
 static int
 i40e_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:57.650031723 +0100
+++ 0050-net-i40e-remove-empty-queue-stats-mapping-set-devops.patch	2019-06-24 16:18:55.119429146 +0100
@@ -1 +1 @@
-From fe1d9ecb304e3e869acbbac00bc855fd25751b1b Mon Sep 17 00:00:00 2001
+From 131c8023818db00b93c1da233357df74006320f1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fe1d9ecb304e3e869acbbac00bc855fd25751b1b ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index bd8a96952..33644557b 100644
+index 74f111e64..d419c0cf0 100644
@@ -27 +28 @@
-@@ -238,8 +238,4 @@ static int i40e_dev_xstats_get_names(struct rte_eth_dev *dev,
+@@ -239,8 +239,4 @@ static int i40e_dev_xstats_get_names(struct rte_eth_dev *dev,
@@ -36 +37 @@
-@@ -458,5 +454,4 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
+@@ -456,5 +452,4 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
@@ -42 +43 @@
-@@ -3432,15 +3427,4 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
+@@ -3429,15 +3424,4 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,