1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 46a7a3febc12..4007f721d25d 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <rdma/rdma_netlink.h>
 
 #include "core_priv.h"
 
@@ -730,14 +731,23 @@ static int __init ib_core_init(void)
                 goto err;
         }
 
+        ret = ibnl_init();
+        if (ret) {
+                printk(KERN_WARNING "Couldn't init IB netlink interface\n");
+                goto err_sysfs;
+        }
+
         ret = ib_cache_setup();
         if (ret) {
                 printk(KERN_WARNING "Couldn't set up InfiniBand P_Key/GID cache\n");
-                goto err_sysfs;
+                goto err_nl;
         }
 
         return 0;
 
+err_nl:
+        ibnl_cleanup();
+
 err_sysfs:
         ib_sysfs_cleanup();
 
@@ -749,6 +759,7 @@ err:
 static void __exit ib_core_cleanup(void)
 {
         ib_cache_cleanup();
+        ibnl_cleanup();
         ib_sysfs_cleanup();
         /* Make sure that any pending umem accounting work is done. */
         destroy_workqueue(ib_wq);