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>

3 files changed, 2 insertions, 20 deletions

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 1d9aed64572..d5084829c9e 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -79,13 +79,8 @@ struct net_device * hostap_add_interface(struct local_info *local,
         if (!rtnl_locked)
                 rtnl_lock();
 
-        ret = 0;
-        if (strchr(dev->name, '%'))
-                ret = dev_alloc_name(dev, dev->name);
-
         SET_NETDEV_DEV(dev, mdev->dev.parent);
-        if (ret >= 0)
-                ret = register_netdevice(dev);
+        ret = register_netdevice(dev);
 
         if (!rtnl_locked)
                 rtnl_unlock();
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index f4f4257a9d6..9d4a40ee16c 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1515,19 +1515,10 @@ static int __init init_mac80211_hwsim(void)
         if (hwsim_mon == NULL)
                 goto failed;
 
-        rtnl_lock();
-
-        err = dev_alloc_name(hwsim_mon, hwsim_mon->name);
+        err = register_netdev(hwsim_mon);
         if (err < 0)
                 goto failed_mon;
 
-
-        err = register_netdevice(hwsim_mon);
-        if (err < 0)
-                goto failed_mon;
-
-        rtnl_unlock();
-
         return 0;
 
 failed_mon:
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index c5971880e7b..d16cea770fa 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -706,10 +706,6 @@ static struct mwifiex_private *mwifiex_add_interface(
                 dev_err(adapter->dev, "no memory available for netdevice\n");
                 goto error;
         }
-        if (dev_alloc_name(dev, dev->name)) {
-                dev_err(adapter->dev, "unable to alloc name for netdevice\n");
-                goto error;
-        }
 
         if (mwifiex_register_cfg80211(dev, adapter->priv[bss_index]->curr_addr,
                                       adapter->priv[bss_index]) != 0) {