IB/core: Integrate IB address resolution module into core

[karo-tx-linux.git] / drivers / infiniband / core / device.c

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 10979844026a01bda540a6f99d2cef0ef56b525f..805d72d67db1d6f6dab302a847f6e153b48cd334 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -983,10 +983,18 @@ static int __init ib_core_init(void)
                goto err_sysfs;
        }
 
+       ret = addr_init();
+       if (ret) {
+               pr_warn("Could't init IB address resolution\n");
+               goto err_ibnl;
+       }
+
        ib_cache_setup();
 
        return 0;
 
+err_ibnl:
+       ibnl_cleanup();
 err_sysfs:
        class_unregister(&ib_class);
 err_comp:
@@ -999,6 +1007,7 @@ err:
 static void __exit ib_core_cleanup(void)
 {
        ib_cache_cleanup();
+       addr_cleanup();
        ibnl_cleanup();
        class_unregister(&ib_class);
        destroy_workqueue(ib_comp_wq);