1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6482aed4bb7c..07b9d1f65b66 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4704,6 +4704,7 @@ static int bond_check_params(struct bond_params *params)
 static struct lock_class_key bonding_netdev_xmit_lock_key;
 
 /* Create a new bond based on the specified name and bonding parameters.
+ * If name is NULL, obtain a suitable "bond%d" name for us.
  * Caller must NOT hold rtnl_lock; we need to release it here before we
  * set up our sysfs entries.
  */
@@ -4713,7 +4714,8 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
         int res;
 
         rtnl_lock();
-        bond_dev = alloc_netdev(sizeof(struct bonding), name, ether_setup);
+        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
+                                ether_setup);
         if (!bond_dev) {
                 printk(KERN_ERR DRV_NAME
                        ": %s: eek! can't alloc netdev!\n",
@@ -4722,6 +4724,12 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
                 goto out_rtnl;
         }
 
+        if (!name) {
+                res = dev_alloc_name(bond_dev, "bond%d");
+                if (res < 0)
+                        goto out_netdev;
+        }
+
         /* bond_init() must be called after dev_alloc_name() (for the
          * /proc files), but before register_netdevice(), because we
          * need to set function pointers.
@@ -4763,7 +4771,6 @@ static int __init bonding_init(void)
 {
         int i;
         int res;
-        char new_bond_name[8];  /* Enough room for 999 bonds at init. */
 
         printk(KERN_INFO "%s", version);
 
@@ -4776,8 +4783,7 @@ static int __init bonding_init(void)
         bond_create_proc_dir();
 #endif
         for (i = 0; i < max_bonds; i++) {
-                sprintf(new_bond_name, "bond%d",i);
-                res = bond_create(new_bond_name,&bonding_defaults, NULL);
+                res = bond_create(NULL, &bonding_defaults, NULL);
                 if (res)
                         goto err;
         }