From: Selvin Xavier <selvin.xavier@broadcom.com>
Date: Mon, 26 Feb 2018 09:51:39 +0000 (-0800)
Subject: RDMA/bnxt_re: Fix the ib_reg failure cleanup
X-Git-Tag: v4.16-rc5~12^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=497158aa5f520db50452ef928c0f955cb42f2e77;p=users%2Fhch%2Fmisc.git

RDMA/bnxt_re: Fix the ib_reg failure cleanup

Release the netdev references in the cleanup path.  Invokes the cleanup
routines if bnxt_re_ib_reg fails.

Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 33a448036c2e..604c805ceaa7 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -1416,9 +1416,12 @@ static void bnxt_re_task(struct work_struct *work)
 	switch (re_work->event) {
 	case NETDEV_REGISTER:
 		rc = bnxt_re_ib_reg(rdev);
-		if (rc)
+		if (rc) {
 			dev_err(rdev_to_dev(rdev),
 				"Failed to register with IB: %#x", rc);
+			bnxt_re_remove_one(rdev);
+			bnxt_re_dev_unreg(rdev);
+		}
 		break;
 	case NETDEV_UP:
 		bnxt_re_dispatch_event(&rdev->ibdev, NULL, 1,