net: call dev_alloc_name from register_netdevice

Force dev_alloc_name() to be called from register_netdevice() by
dev_get_valid_name(). That allows to remove multiple explicit
dev_alloc_name() calls.

The possibility to call dev_alloc_name in advance remains.

This also fixes veth creation regresion caused by
84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 22bd03bd1d35..9a5feaf4bab9 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4917,8 +4917,9 @@ int bond_create(struct net *net, const char *name)
 
         rtnl_lock();
 
-        bond_dev = alloc_netdev_mq(sizeof(struct bonding), name ? name : "",
-                                bond_setup, tx_queues);
+        bond_dev = alloc_netdev_mq(sizeof(struct bonding),
+                                   name ? name : "bond%d",
+                                   bond_setup, tx_queues);
         if (!bond_dev) {
                 pr_err("%s: eek! can't alloc netdev!\n", name);
                 rtnl_unlock();
@@ -4928,26 +4929,10 @@ int bond_create(struct net *net, const char *name)
         dev_net_set(bond_dev, net);
         bond_dev->rtnl_link_ops = &bond_link_ops;
 
-        if (!name) {
-                res = dev_alloc_name(bond_dev, "bond%d");
-                if (res < 0)
-                        goto out;
-        } else {
-                /*
-                 * If we're given a name to register
-                 * we need to ensure that its not already
-                 * registered
-                 */
-                res = -EEXIST;
-                if (__dev_get_by_name(net, name) != NULL)
-                        goto out;
-        }
-
         res = register_netdevice(bond_dev);
 
         netif_carrier_off(bond_dev);
 
-out:
         rtnl_unlock();
         if (res < 0)
                 bond_destructor(bond_dev);