1 files changed, 75 insertions, 18 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ee4035571c21..6cc8a70350ac 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -817,7 +817,9 @@ int dev_alloc_name(struct net_device *dev, const char *name)
  */
 int dev_change_name(struct net_device *dev, char *newname)
 {
+        char oldname[IFNAMSIZ];
         int err = 0;
+        int ret;
 
         ASSERT_RTNL();
 
@@ -827,6 +829,8 @@ int dev_change_name(struct net_device *dev, char *newname)
         if (!dev_valid_name(newname))
                 return -EINVAL;
 
+        memcpy(oldname, dev->name, IFNAMSIZ);
+
         if (strchr(newname, '%')) {
                 err = dev_alloc_name(dev, newname);
                 if (err < 0)
@@ -838,10 +842,28 @@ int dev_change_name(struct net_device *dev, char *newname)
         else
                 strlcpy(dev->name, newname, IFNAMSIZ);
 
+rollback:
         device_rename(&dev->dev, dev->name);
+
+        write_lock_bh(&dev_base_lock);
         hlist_del(&dev->name_hlist);
         hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name));
-        raw_notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
+        write_unlock_bh(&dev_base_lock);
+
+        ret = raw_notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
+        ret = notifier_to_errno(ret);
+
+        if (ret) {
+                if (err) {
+                        printk(KERN_ERR
+                               "%s: name change rollback failed: %d.\n",
+                               dev->name, ret);
+                } else {
+                        err = ret;
+                        memcpy(dev->name, oldname, IFNAMSIZ);
+                        goto rollback;
+                }
+        }
 
         return err;
 }
@@ -1054,20 +1076,43 @@ int dev_close(struct net_device *dev)
 int register_netdevice_notifier(struct notifier_block *nb)
 {
         struct net_device *dev;
+        struct net_device *last;
         int err;
 
         rtnl_lock();
         err = raw_notifier_chain_register(&netdev_chain, nb);
-        if (!err) {
-                for_each_netdev(dev) {
-                        nb->notifier_call(nb, NETDEV_REGISTER, dev);
+        if (err)
+                goto unlock;
 
-                        if (dev->flags & IFF_UP)
-                                nb->notifier_call(nb, NETDEV_UP, dev);
-                }
+        for_each_netdev(dev) {
+                err = nb->notifier_call(nb, NETDEV_REGISTER, dev);
+                err = notifier_to_errno(err);
+                if (err)
+                        goto rollback;
+
+                if (!(dev->flags & IFF_UP))
+                        continue;
+
+                nb->notifier_call(nb, NETDEV_UP, dev);
         }
+
+unlock:
         rtnl_unlock();
         return err;
+
+rollback:
+        last = dev;
+        for_each_netdev(dev) {
+                if (dev == last)
+                        break;
+
+                if (dev->flags & IFF_UP) {
+                        nb->notifier_call(nb, NETDEV_GOING_DOWN, dev);
+                        nb->notifier_call(nb, NETDEV_DOWN, dev);
+                }
+                nb->notifier_call(nb, NETDEV_UNREGISTER, dev);
+        }
+        goto unlock;
 }
 
 /**
@@ -2718,9 +2763,11 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
 /**
  *      dev_unicast_delete      - Release secondary unicast address.
  *      @dev: device
+ *      @addr: address to delete
+ *      @alen: length of @addr
  *
  *      Release reference to a secondary unicast address and remove it
- *      from the device if the reference count drop to zero.
+ *      from the device if the reference count drops to zero.
  *
  *      The caller must hold the rtnl_mutex.
  */
@@ -2742,6 +2789,8 @@ EXPORT_SYMBOL(dev_unicast_delete);
 /**
  *      dev_unicast_add         - add a secondary unicast address
  *      @dev: device
+ *      @addr: address to delete
+ *      @alen: length of @addr
  *
  *      Add a secondary unicast address to the device or increase
  *      the reference count if it already exists.
@@ -3333,7 +3382,7 @@ int register_netdevice(struct net_device *dev)
 
         if (!dev_valid_name(dev->name)) {
                 ret = -EINVAL;
-                goto out;
+                goto err_uninit;
         }
 
         dev->ifindex = dev_new_index();
@@ -3347,7 +3396,7 @@ int register_netdevice(struct net_device *dev)
                         = hlist_entry(p, struct net_device, name_hlist);
                 if (!strncmp(d->name, dev->name, IFNAMSIZ)) {
                         ret = -EEXIST;
-                        goto out;
+                        goto err_uninit;
                 }
         }
 
@@ -3407,7 +3456,7 @@ int register_netdevice(struct net_device *dev)
 
         ret = netdev_register_sysfs(dev);
         if (ret)
-                goto out;
+                goto err_uninit;
         dev->reg_state = NETREG_REGISTERED;
 
         /*
@@ -3426,12 +3475,18 @@ int register_netdevice(struct net_device *dev)
         write_unlock_bh(&dev_base_lock);
 
         /* Notify protocols, that a new device appeared. */
-        raw_notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);
-
-        ret = 0;
+        ret = raw_notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);
+        ret = notifier_to_errno(ret);
+        if (ret)
+                unregister_netdevice(dev);
 
 out:
         return ret;
+
+err_uninit:
+        if (dev->uninit)
+                dev->uninit(dev);
+        goto out;
 }
 
 /**
@@ -3830,9 +3885,11 @@ static int dev_cpu_callback(struct notifier_block *nfb,
 
 #ifdef CONFIG_NET_DMA
 /**
- * net_dma_rebalance -
- * This is called when the number of channels allocated to the net_dma_client
- * changes.  The net_dma_client tries to have one DMA channel per CPU.
+ * net_dma_rebalance - try to maintain one DMA channel per CPU
+ * @net_dma: DMA client and associated data (lock, channels, channel_mask)
+ *
+ * This is called when the number of channels allocated to the net_dma client
+ * changes.  The net_dma client tries to have one DMA channel per CPU.
  */
 
 static void net_dma_rebalance(struct net_dma *net_dma)
@@ -3869,7 +3926,7 @@ static void net_dma_rebalance(struct net_dma *net_dma)
  * netdev_dma_event - event callback for the net_dma_client
  * @client: should always be net_dma_client
  * @chan: DMA channel for the event
- * @event: event type
+ * @state: DMA state to be handled
  */
 static enum dma_state_client
 netdev_dma_event(struct dma_client *client, struct dma_chan *chan,