[dpdk-stable] patch 'net/netvsc: fix xstats id' has been queued to LTS release 18.11.3

[Kevin Traynor]

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 08/28/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/9fd8123bdaefd63d9158fa91bd13820a8b7fb397

Thanks.

Kevin Traynor

---
>From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001
From: Mohsin Mazhar Shaikh <mohsinmazhar_shaikh at trendmicro.com>
Date: Thu, 20 Jun 2019 15:09:23 -0700
Subject: [PATCH] net/netvsc: fix xstats id

[ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ]

The xstats_get was not setting id correctly for each entry.

Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")

Signed-off-by: Mohsin Mazhar Shaikh <mohsinmazhar_shaikh at trendmicro.com>
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/netvsc/hn_ethdev.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index c3afd2fe9..cf03972fd 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
 
 		stats = (const char *)&txq->stats;
-		for (t = 0; t < RTE_DIM(hn_stat_strings); t++)
-			xstats[count++].value = *(const uint64_t *)
+		for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) {
+			xstats[count].id = count;
+			xstats[count].value = *(const uint64_t *)
 				(stats + hn_stat_strings[t].offset);
+		}
 	}
 
@@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
 
 		stats = (const char *)&rxq->stats;
-		for (t = 0; t < RTE_DIM(hn_stat_strings); t++)
-			xstats[count++].value = *(const uint64_t *)
+		for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) {
+			xstats[count].id = count;
+			xstats[count].value = *(const uint64_t *)
 				(stats + hn_stat_strings[t].offset);
+		}
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.903047589 +0100
+++ 0022-net-netvsc-fix-xstats-id.patch	2019-08-22 19:38:20.442026760 +0100
@@ -1 +1 @@
-From b21ad01a82904413485c82a08c154aeacf31fd02 Mon Sep 17 00:00:00 2001
+From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index e0b701676..69cf5d1d9 100644
+index c3afd2fe9..cf03972fd 100644
@@ -21 +22 @@
-@@ -743,7 +743,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
+@@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
@@ -33 +34 @@
-@@ -755,7 +757,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
+@@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,