Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-17 11:58:49 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-17 11:58:56 +0200
commit20d1c2559d0cf2e099b9c21bb21e53d8b57c08f0 (patch)
tree74e670bf340ba9fcaf60744a8ad7e93734b51202
parent4f4d8d1a7a3b1c68e48b04c6940b23e1a2a8ed73 (diff)
RDMA/bnxt_re: Remove redundant bnxt_qplib_disable_nq() call
(bsc#1086283 FATE#324874).
-rw-r--r--patches.drivers/RDMA-bnxt_re-Remove-redundant-bnxt_qplib_disable_nq-.patch27
-rw-r--r--series.conf1
2 files changed, 28 insertions, 0 deletions
diff --git a/patches.drivers/RDMA-bnxt_re-Remove-redundant-bnxt_qplib_disable_nq-.patch b/patches.drivers/RDMA-bnxt_re-Remove-redundant-bnxt_qplib_disable_nq-.patch
new file mode 100644
index 0000000000..c8cd5616c4
--- /dev/null
+++ b/patches.drivers/RDMA-bnxt_re-Remove-redundant-bnxt_qplib_disable_nq-.patch
@@ -0,0 +1,27 @@
+From: Arvind Yadav <arvind.yadav.cs@gmail.com>
+Date: Tue, 14 Nov 2017 18:20:56 +0530
+Subject: RDMA/bnxt_re: Remove redundant bnxt_qplib_disable_nq() call
+Patch-mainline: v4.16-rc1
+Git-commit: 302784729e7fb29d5888686fe83b42bb18f81ab8
+References: bsc#1086283 FATE#324874
+
+The bnxt_qplib_disable_nq() call is redundant as it occurs
+after 'goto fail' and hence it called twice. Remove it.
+
+Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
+Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+@@ -415,7 +415,6 @@ int bnxt_qplib_enable_nq(struct pci_dev
+ if (rc) {
+ dev_err(&nq->pdev->dev,
+ "Failed to request IRQ for NQ: %#x", rc);
+- bnxt_qplib_disable_nq(nq);
+ goto fail;
+ }
+
diff --git a/series.conf b/series.conf
index f60470750e..f696b1b7f4 100644
--- a/series.conf
+++ b/series.conf
@@ -10826,6 +10826,7 @@
patches.drivers/IB-hfi1-Use-4096-for-default-active-MTU-in-query_qp.patch
patches.drivers/IB-qib-Fix-comparison-error-with-qperf-compare-swap-.patch
patches.drivers/IB-mlx5-revisit-Wmaybe-uninitialized-warning.patch
+ patches.drivers/RDMA-bnxt_re-Remove-redundant-bnxt_qplib_disable_nq-.patch
patches.drivers/RDMA-iwpm-Fix-uninitialized-error-code-in-iwpm_send_.patch
patches.drivers/iw_cxgb4-make-pointer-reg_workq-static.patch
patches.drivers/IB-ipoib-Avoid-memory-leak-if-the-SA-returns-a-diffe.patch