[dpdk-stable] patch 'net/tap: fix reported number of Tx packets' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/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.

Kevin Traynor

---
>From 9b0d69c4cbbac9dbd4090093d1e91d03d2004046 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at mellanox.com>
Date: Wed, 10 Oct 2018 07:01:41 +0000
Subject: [PATCH] net/tap: fix reported number of Tx packets

[ upstream commit 9396ad3346720b424a10dcf6640c919e37a4fcf7 ]

When writev fails to send packets it doesn't update the
number of Tx packets, but it still num_tx is updated.

The value that should be returned is the actual number
of sent packets which is num_packets.

Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")

Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
Acked-by: Keith Wiles <keith.wiles at intel.com>
---
 drivers/net/tap/rte_eth_tap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index feb92b48e..e05c7ba72 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -687,5 +687,5 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 	txq->stats.obytes += num_tx_bytes;
 
-	return num_tx;
+	return num_packets;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:32.687616174 +0000
+++ 0016-net-tap-fix-reported-number-of-Tx-packets.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,8 +1,10 @@
-From 9396ad3346720b424a10dcf6640c919e37a4fcf7 Mon Sep 17 00:00:00 2001
+From 9b0d69c4cbbac9dbd4090093d1e91d03d2004046 Mon Sep 17 00:00:00 2001
 From: Raslan Darawsheh <rasland at mellanox.com>
 Date: Wed, 10 Oct 2018 07:01:41 +0000
 Subject: [PATCH] net/tap: fix reported number of Tx packets
 
+[ upstream commit 9396ad3346720b424a10dcf6640c919e37a4fcf7 ]
+
 When writev fails to send packets it doesn't update the
 number of Tx packets, but it still num_tx is updated.
 
@@ -10,7 +12,6 @@
 of sent packets which is num_packets.
 
 Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
-CC: stable at dpdk.org
 
 Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
 Acked-by: Keith Wiles <keith.wiles at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
-index 84aaf2410..77f26940b 100644
+index feb92b48e..e05c7ba72 100644
 --- a/drivers/net/tap/rte_eth_tap.c
 +++ b/drivers/net/tap/rte_eth_tap.c
-@@ -686,5 +686,5 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+@@ -687,5 +687,5 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
  	txq->stats.obytes += num_tx_bytes;
  
 -	return num_tx;