From: Parav Pandit Date: Mon, 15 Apr 2019 10:22:49 +0000 (+0300) Subject: RDMA/core: Avoid freeing netdevs in disable_device() X-Git-Tag: v5.2-rc1~114^2~66 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3042492bd1f9a08e9cf4c1a4621e359fb0f9a126;p=linux.git 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 Signed-off-by: Jason Gunthorpe --- 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);