[dpdk-stable] patch 'net/pcap: fix byte stats for drop Tx' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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/10/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/de27f6be212feb50f8a8d7e4f8bcd3d068c795c4

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From de27f6be212feb50f8a8d7e4f8bcd3d068c795c4 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Wed, 3 Feb 2021 17:30:25 +0000
Subject: [PATCH] net/pcap: fix byte stats for drop Tx

[ upstream commit cec222d6e55d9bd15eff7fbbf45464c0c6a941c0 ]

Drop Tx path in pcap is Tx that just drops the packets, which is used
for the case only Rx from a pcap file is requested/matters.

The byte stats was calculated using first mbuf segment, which gives
wrong values for multi segmented mbufs, updated to use packet length
instead.

Bugzilla ID: 597
Fixes: a3f5252e5cbd ("net/pcap: enable infinitely Rx a pcap file")

Reported-by: Cian Ferriter <cian.ferriter at intel.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Cian Ferriter <cian.ferriter at intel.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index f0c900ba88..6fbf61f819 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -377,7 +377,7 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 		return 0;
 
 	for (i = 0; i < nb_pkts; i++) {
-		tx_bytes += bufs[i]->data_len;
+		tx_bytes += bufs[i]->pkt_len;
 		rte_pktmbuf_free(bufs[i]);
 	}
 
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-08 12:04:30.029288623 +0100
+++ 0013-net-pcap-fix-byte-stats-for-drop-Tx.patch	2021-02-08 12:04:29.551496794 +0100
@@ -1 +1 @@
-From cec222d6e55d9bd15eff7fbbf45464c0c6a941c0 Mon Sep 17 00:00:00 2001
+From de27f6be212feb50f8a8d7e4f8bcd3d068c795c4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cec222d6e55d9bd15eff7fbbf45464c0c6a941c0 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index ff02ade70d..c7751b7ba7 100644
+index f0c900ba88..6fbf61f819 100644
@@ -28 +29 @@
-@@ -386,7 +386,7 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+@@ -377,7 +377,7 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)