[dpdk-stable] patch 'net/ark: fix queue packet replacement' 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 09/04/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/ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8

Thanks.

Kevin Traynor

---
>From ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8 Mon Sep 17 00:00:00 2001
From: Ed Czeck <ed.czeck at atomicrules.com>
Date: Mon, 22 Jul 2019 08:35:40 -0400
Subject: [PATCH] net/ark: fix queue packet replacement

[ upstream commit 7311db731863841f71be27edfad7aab9081ff4e5 ]

Queue index was incorrectly incremented with port, which
caused incorrect queue packet placement. This manifested
when port number was != 0.

Fixes: c33d45af3633 ("net/ark: add Tx initial version")

Signed-off-by: Ed Czeck <ed.czeck at atomicrules.com>
---
 drivers/net/ark/ark_ethdev_rx.c | 4 +---
 drivers/net/ark/ark_ethdev_tx.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c
index 7de1a9851..6156730bb 100644
--- a/drivers/net/ark/ark_ethdev_rx.c
+++ b/drivers/net/ark/ark_ethdev_rx.c
@@ -128,7 +128,5 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
 	int status;
 
-	/* Future works: divide the Q's evenly with multi-ports */
-	int port = dev->data->port_id;
-	int qidx = port + queue_idx;
+	int qidx = queue_idx;
 
 	/* We may already be setup, free memory prior to re-allocation */
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 196765570..08bcf431a 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -212,7 +212,5 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
 	int status;
 
-	/* Future: divide the Q's evenly with multi-ports */
-	int port = dev->data->port_id;
-	int qidx = port + queue_idx;
+	int qidx = queue_idx;
 
 	if (!rte_is_power_of_2(nb_desc)) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:35.139823250 +0100
+++ 0056-net-ark-fix-queue-packet-replacement.patch	2019-08-28 14:32:31.732955332 +0100
@@ -1 +1 @@
-From 7311db731863841f71be27edfad7aab9081ff4e5 Mon Sep 17 00:00:00 2001
+From ce7bf1b5ea8ae8ad668d6598a3e372bf6f6852c8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7311db731863841f71be27edfad7aab9081ff4e5 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org