1 files changed, 4 insertions, 4 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ea23353e6251..3ed09f8ecbf8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5437,6 +5437,10 @@ int register_netdevice(struct net_device *dev)
 
         dev->iflink = -1;
 
+        ret = dev_get_valid_name(dev, dev->name);
+        if (ret < 0)
+                goto out;
+
         /* Init, if this function is available */
         if (dev->netdev_ops->ndo_init) {
                 ret = dev->netdev_ops->ndo_init(dev);
@@ -5447,10 +5451,6 @@ int register_netdevice(struct net_device *dev)
                 }
         }
 
-        ret = dev_get_valid_name(dev, dev->name);
-        if (ret < 0)
-                goto err_uninit;
-
         dev->ifindex = dev_new_index(net);
         if (dev->iflink == -1)
                 dev->iflink = dev->ifindex;