X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=d334446a8eaf8e4cfdd5953be2c03d9cbe1d0e98;hb=2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92;hp=a9500e6b3aa2d7c2650d75e23534832c8ad66231;hpb=0c0b0aca66b3a58e12a216d992a0b534eff210e0;p=linux-2.6

diff --git a/net/core/dev.c b/net/core/dev.c
index a9500e6b3a..d334446a8e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3776,6 +3776,7 @@ int register_netdevice(struct net_device *dev)
 		}
 	}
 
+	netdev_initialize_kobject(dev);
 	ret = netdev_register_kobject(dev);
 	if (ret)
 		goto err_uninit;
@@ -4208,7 +4209,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
 	}
 
 	/* Fixup kobjects */
-	err = device_rename(&dev->dev, dev->name);
+	netdev_unregister_kobject(dev);
+	err = netdev_register_kobject(dev);
 	WARN_ON(err);
 
 	/* Add the device back in the hashes */