summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParav Pandit <parav@mellanox.com>2019-04-15 13:22:49 +0300
committerJason Gunthorpe <jgg@mellanox.com>2019-04-22 14:44:58 -0300
commit3042492bd1f9a08e9cf4c1a4621e359fb0f9a126 (patch)
tree1a2862f71ba26459483335426a91809daf9beb40
parent2d959849775772d6a78ebedc68ba04ebd2904e7a (diff)
RDMA/core: Avoid freeing netdevs in disable_device()
So we can use the disable_device() helper while changing the net namespace of the rdma device in a subsequent patch, move free_netdevs() out of it. Signed-off-by: Parav Pandit <parav@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--drivers/infiniband/core/device.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 88c4238bbee1..25f49b646007 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -1152,9 +1152,6 @@ static void disable_device(struct ib_device *device)
* devices and before device is disabled.
*/
remove_compat_devs(device);
-
- /* Expedite removing unregistered pointers from the hash table */
- free_netdevs(device);
}
/*
@@ -1297,6 +1294,10 @@ static void __ib_unregister_device(struct ib_device *ib_dev)
goto out;
disable_device(ib_dev);
+
+ /* Expedite removing unregistered pointers from the hash table */
+ free_netdevs(ib_dev);
+
ib_device_unregister_sysfs(ib_dev);
device_del(&ib_dev->dev);
ib_device_unregister_rdmacg(ib_dev);