[dpdk-stable] patch 'net/mlx5: remove redundant item from union' 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/401829241b8ec7d4e4bdf241431884a4d7a28ddc

Thanks.

Kevin Traynor

---
>From 401829241b8ec7d4e4bdf241431884a4d7a28ddc Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Mon, 22 Jul 2019 14:51:58 +0000
Subject: [PATCH] net/mlx5: remove redundant item from union

[ upstream commit 970eb58c475abb5902b0f00627b771f0ab12960d ]

A variable of type struct ibv_cq_ex is declared in 2 unions, but
isn't used.
This patch removes the 2 redundant declarations.

Fixes: 6218063b39a6 ("net/mlx5: refactor Rx data path")
Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 1 -
 drivers/net/mlx5/mlx5_txq.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 45f49669c..f6edb10fe 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -774,5 +774,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
 #endif
 		} wq;
-		struct ibv_cq_ex cq_attr;
 	} attr;
 	unsigned int cqe_n;
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 9d1c33eba..e6020fbcb 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -366,5 +366,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
 		struct ibv_cq_init_attr_ex cq;
 		struct ibv_qp_attr mod;
-		struct ibv_cq_ex cq_attr;
 	} attr;
 	unsigned int cqe_n;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:35.321931789 +0100
+++ 0059-net-mlx5-remove-redundant-item-from-union.patch	2019-08-28 14:32:31.742955109 +0100
@@ -1 +1 @@
-From 970eb58c475abb5902b0f00627b771f0ab12960d Mon Sep 17 00:00:00 2001
+From 401829241b8ec7d4e4bdf241431884a4d7a28ddc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 970eb58c475abb5902b0f00627b771f0ab12960d ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 39b8b7a8f..0535ce347 100644
+index 45f49669c..f6edb10fe 100644
@@ -26 +27 @@
-@@ -840,5 +840,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
+@@ -774,5 +774,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
@@ -33 +34 @@
-index 2f3aa5b28..dbad361ac 100644
+index 9d1c33eba..e6020fbcb 100644
@@ -36 +37 @@
-@@ -389,5 +389,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
+@@ -366,5 +366,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)