[dpdk-stable] patch 'net/i40e: fix dropped packets statistics name' 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 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/4d4cf62ff06d4eda0451d84140b4170b327708f0

Thanks.

Kevin Traynor

---
>From 4d4cf62ff06d4eda0451d84140b4170b327708f0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 3 Jun 2019 10:31:27 +0200
Subject: [PATCH] net/i40e: fix dropped packets statistics name

[ upstream commit 61e5456cdf67ecf6032c5dbf88caf88213021a89 ]

i40e and i40evf currently use two different names for the statistic on
dropped packets on the rx and tx sides.
Let's prefer i40evf so that all statistics are suffixed with _packets.

This also avoids a statistic name conflict in OVS.

Fixes: f4a91c38b4ad ("i40e: add extended stats")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Eelco Chaudron <echaudro at redhat.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index d93cb00d4..74f111e64 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -525,5 +525,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
 	{"rx_multicast_packets", offsetof(struct i40e_eth_stats, rx_multicast)},
 	{"rx_broadcast_packets", offsetof(struct i40e_eth_stats, rx_broadcast)},
-	{"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)},
+	{"rx_dropped_packets", offsetof(struct i40e_eth_stats, rx_discards)},
 	{"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats,
 		rx_unknown_protocol)},
@@ -531,5 +531,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
 	{"tx_multicast_packets", offsetof(struct i40e_eth_stats, tx_multicast)},
 	{"tx_broadcast_packets", offsetof(struct i40e_eth_stats, tx_broadcast)},
-	{"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)},
+	{"tx_dropped_packets", offsetof(struct i40e_eth_stats, tx_discards)},
 };
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:57.591863923 +0100
+++ 0049-net-i40e-fix-dropped-packets-statistics-name.patch	2019-06-24 16:18:55.107429430 +0100
@@ -1 +1 @@
-From 61e5456cdf67ecf6032c5dbf88caf88213021a89 Mon Sep 17 00:00:00 2001
+From 4d4cf62ff06d4eda0451d84140b4170b327708f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61e5456cdf67ecf6032c5dbf88caf88213021a89 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index a8688e0c3..bd8a96952 100644
+index d93cb00d4..74f111e64 100644
@@ -26 +27 @@
-@@ -527,5 +527,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
+@@ -525,5 +525,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
@@ -33 +34 @@
-@@ -533,5 +533,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
+@@ -531,5 +531,5 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {