[dpdk-stable] patch 'Revert "net/i40e: fix packet count for PF"' has been queued to LTS release 16.11.8

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.8

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/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 2a7790e63aaa7ba16d7f8e0d71655228b9b53c03 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Mon, 27 Aug 2018 10:44:36 +0100
Subject: [PATCH] Revert "net/i40e: fix packet count for PF"

This patch introduced a regression in the Fortville regression tests.
>From the tester's report:

1.FVL function test: still have 7 failed.
 These 7 failed cases are the similar issue: it will send blank packet
 when it send packet, it caused the packet validate failed.
  Jumboframes/jumboframes_jumbo_jumbo: could pass with
  dpdk-stable-16.11.4
  Jumboframes/jumboframes_normal_jumbo: same with above
  Jumboframes/jumboframes_normal_nojumbo: same with above
  dynamic_config/dynamic_config_enable_promiscuous: same with above
  pmd/checksum_checking: could pass with dpdk-stable-16.11.3, failed
  with dpdk-stable-16.11.4 and later versions
  pmd/packet_checking: same with above

This reverts commit 4bf705a7d74b0b4c1d82ad0821c43e32be15a5e5.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/i40e/i40e_ethdev.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 01f473c2bb..3061296340 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2578,14 +2578,13 @@ i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 	/* call read registers - updates values, now write them to struct */
 	i40e_read_stats_registers(pf, hw);
 
-	stats->ipackets = ns->eth.rx_unicast +
-			ns->eth.rx_multicast +
-			ns->eth.rx_broadcast -
-			ns->eth.rx_discards -
+	stats->ipackets = pf->main_vsi->eth_stats.rx_unicast +
+			pf->main_vsi->eth_stats.rx_multicast +
+			pf->main_vsi->eth_stats.rx_broadcast -
 			pf->main_vsi->eth_stats.rx_discards;
-	stats->opackets = ns->eth.tx_unicast +
-			ns->eth.tx_multicast +
-			ns->eth.tx_broadcast;
+	stats->opackets = pf->main_vsi->eth_stats.tx_unicast +
+			pf->main_vsi->eth_stats.tx_multicast +
+			pf->main_vsi->eth_stats.tx_broadcast;
 	stats->ibytes   = ns->eth.rx_bytes;
 	stats->obytes   = ns->eth.tx_bytes;
 	stats->oerrors  = ns->eth.tx_errors +
-- 
2.18.0