[dpdk-stable] patch 'net/ena: fix invalid reference to variable in union' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.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 01/11/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.

Thanks.

Kevin Traynor

---
>From ce4014623d0df375dec16bc490090e77574263d8 Mon Sep 17 00:00:00 2001
From: Rafal Kozik <rk at semihalf.com>
Date: Fri, 14 Dec 2018 14:18:39 +0100
Subject: [PATCH] net/ena: fix invalid reference to variable in union

[ upstream commit eccbe2ffdc755a9e759c6ba480f6c15ccb1163c7 ]

Use empty_rx_reqs instead of empty_tx_reqs.
As those two variables are part of union this not cause
any failure, but for consistency should be changed.

Fixes: c2034976673d ("net/ena: add Rx out of order completion")

Signed-off-by: Rafal Kozik <rk at semihalf.com>
Acked-by: Michal Krawczyk <mk at semihalf.com>
---
 drivers/net/ena/ena_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 4a9b1eebf..e8db81a38 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -1324,5 +1324,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
 
 	for (i = 0; i < nb_desc; i++)
-		rxq->empty_tx_reqs[i] = i;
+		rxq->empty_rx_reqs[i] = i;
 
 	/* Store pointer to this queue in upper layer */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:08.787078059 +0000
+++ 0055-net-ena-fix-invalid-reference-to-variable-in-union.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,14 +1,15 @@
-From eccbe2ffdc755a9e759c6ba480f6c15ccb1163c7 Mon Sep 17 00:00:00 2001
+From ce4014623d0df375dec16bc490090e77574263d8 Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <rk at semihalf.com>
 Date: Fri, 14 Dec 2018 14:18:39 +0100
 Subject: [PATCH] net/ena: fix invalid reference to variable in union
 
+[ upstream commit eccbe2ffdc755a9e759c6ba480f6c15ccb1163c7 ]
+
 Use empty_rx_reqs instead of empty_tx_reqs.
 As those two variables are part of union this not cause
 any failure, but for consistency should be changed.
 
 Fixes: c2034976673d ("net/ena: add Rx out of order completion")
-Cc: stable at dpdk.org
 
 Signed-off-by: Rafal Kozik <rk at semihalf.com>
 Acked-by: Michal Krawczyk <mk at semihalf.com>
@@ -17,10 +18,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 3aa32a3bf..14165561e 100644
+index 4a9b1eebf..e8db81a38 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
-@@ -1388,5 +1388,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1324,5 +1324,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
  
  	for (i = 0; i < nb_desc; i++)
 -		rxq->empty_tx_reqs[i] = i;