[dpdk-stable] patch 'net/mlx5: remove unused variable in Tx queue creation' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Luca Boccassi

---
>From 17919bbb10f606a242a7c3b860c5c713255ae40d Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Thu, 1 Oct 2020 14:09:13 +0000
Subject: [PATCH] net/mlx5: remove unused variable in Tx queue creation

[ upstream commit fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e ]

When a CQ is not created by DevX, it be allocated by either DV function
or by regular Verbs function.

The CQ DV attributes variable was wrongly defined and initialized in Tx
queue creation while the CQ is created by the regular Verbs function
what remained the attributes variable unused.

Remove the unused variable.

Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_txq.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index f688027fb3..36aa9b59f3 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -582,7 +582,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
 	struct mlx5_txq_obj *txq_obj = NULL;
 	union {
 		struct ibv_qp_init_attr_ex init;
-		struct ibv_cq_init_attr_ex cq;
 		struct ibv_qp_attr mod;
 	} attr;
 	unsigned int cqe_n;
@@ -610,9 +609,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
 		return NULL;
 	}
 	memset(&tmpl, 0, sizeof(struct mlx5_txq_obj));
-	attr.cq = (struct ibv_cq_init_attr_ex){
-		.comp_mask = 0,
-	};
 	cqe_n = desc / MLX5_TX_COMP_THRESH +
 		1 + MLX5_TX_COMP_THRESH_INLINE_DIV;
 	tmpl.cq = mlx5_glue->create_cq(priv->sh->ctx, cqe_n, NULL, NULL, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.659600639 +0000
+++ 0126-net-mlx5-remove-unused-variable-in-Tx-queue-creation.patch	2020-10-28 10:35:11.688832733 +0000
@@ -1,8 +1,10 @@
-From fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e Mon Sep 17 00:00:00 2001
+From 17919bbb10f606a242a7c3b860c5c713255ae40d Mon Sep 17 00:00:00 2001
 From: Michael Baum <michaelba at nvidia.com>
 Date: Thu, 1 Oct 2020 14:09:13 +0000
 Subject: [PATCH] net/mlx5: remove unused variable in Tx queue creation
 
+[ upstream commit fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e ]
+
 When a CQ is not created by DevX, it be allocated by either DV function
 or by regular Verbs function.
 
@@ -13,7 +15,6 @@
 Remove the unused variable.
 
 Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michael Baum <michaelba at nvidia.com>
 Acked-by: Matan Azrad <matan at nvidia.com>
@@ -22,10 +23,10 @@
  1 file changed, 4 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
-index fc730fae82..ef3137bd14 100644
+index f688027fb3..36aa9b59f3 100644
 --- a/drivers/net/mlx5/mlx5_txq.c
 +++ b/drivers/net/mlx5/mlx5_txq.c
-@@ -1168,7 +1168,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
+@@ -582,7 +582,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
  	struct mlx5_txq_obj *txq_obj = NULL;
  	union {
  		struct ibv_qp_init_attr_ex init;
@@ -33,7 +34,7 @@
  		struct ibv_qp_attr mod;
  	} attr;
  	unsigned int cqe_n;
-@@ -1198,9 +1197,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
+@@ -610,9 +609,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx,
  		return NULL;
  	}
  	memset(&tmpl, 0, sizeof(struct mlx5_txq_obj));