1 files changed, 6 insertions, 3 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index f1647d7dd14b..853c8b575f1d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -883,6 +883,9 @@ int dev_change_name(struct net_device *dev, char *newname)
         if (!dev_valid_name(newname))
                 return -EINVAL;
 
+        if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
+                return 0;
+
         memcpy(oldname, dev->name, IFNAMSIZ);
 
         if (strchr(newname, '%')) {
@@ -2665,7 +2668,7 @@ static void __net_exit dev_proc_net_exit(struct net *net)
         proc_net_remove(net, "dev");
 }
 
-static struct pernet_operations __net_initdata dev_proc_ops = {
+static struct pernet_operations dev_proc_ops = {
         .init = dev_proc_net_init,
         .exit = dev_proc_net_exit,
 };
@@ -4325,7 +4328,7 @@ static void __net_exit netdev_exit(struct net *net)
         kfree(net->dev_index_head);
 }
 
-static struct pernet_operations __net_initdata netdev_net_ops = {
+static struct pernet_operations  netdev_net_ops = {
         .init = netdev_init,
         .exit = netdev_exit,
 };
@@ -4356,7 +4359,7 @@ static void __net_exit default_device_exit(struct net *net)
         rtnl_unlock();
 }
 
-static struct pernet_operations __net_initdata default_device_ops = {
+static struct pernet_operations  default_device_ops = {
         .exit = default_device_exit,
 };