1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 2cf1a4088718..5a76a5510350 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -61,6 +61,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
 
         ppriv = netdev_priv(pdev);
 
+        rtnl_lock();
         mutex_lock(&ppriv->vlan_mutex);
 
         /*
@@ -111,7 +112,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
                 goto device_init_failed;
         }
 
-        result = register_netdev(priv->dev);
+        result = register_netdevice(priv->dev);
         if (result) {
                 ipoib_warn(priv, "failed to initialize; error %i", result);
                 goto register_failed;
@@ -134,12 +135,13 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
         list_add_tail(&priv->list, &ppriv->child_intfs);
 
         mutex_unlock(&ppriv->vlan_mutex);
+        rtnl_unlock();
 
         return 0;
 
 sysfs_failed:
         ipoib_delete_debug_files(priv->dev);
-        unregister_netdev(priv->dev);
+        unregister_netdevice(priv->dev);
 
 register_failed:
         ipoib_dev_cleanup(priv->dev);
@@ -149,6 +151,7 @@ device_init_failed:
 
 err:
         mutex_unlock(&ppriv->vlan_mutex);
+        rtnl_unlock();
         return result;
 }
 
@@ -162,10 +165,11 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
 
         ppriv = netdev_priv(pdev);
 
+        rtnl_lock();
         mutex_lock(&ppriv->vlan_mutex);
         list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
                 if (priv->pkey == pkey) {
-                        unregister_netdev(priv->dev);
+                        unregister_netdevice(priv->dev);
                         ipoib_dev_cleanup(priv->dev);
                         list_del(&priv->list);
                         free_netdev(priv->dev);
@@ -175,6 +179,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
                 }
         }
         mutex_unlock(&ppriv->vlan_mutex);
+        rtnl_unlock();
 
         return ret;
 }