1 files changed, 12 insertions, 3 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 92d6b9467314..6ac29a46e23e 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -270,7 +270,6 @@ static ssize_t netstat_show(const struct device *d,
                             unsigned long offset)
 {
         struct net_device *dev = to_net_dev(d);
-        struct net_device_stats *stats;
         ssize_t ret = -EINVAL;
 
         WARN_ON(offset > sizeof(struct net_device_stats) ||
@@ -278,7 +277,7 @@ static ssize_t netstat_show(const struct device *d,
 
         read_lock(&dev_base_lock);
         if (dev_isalive(dev)) {
-                stats = dev->get_stats(dev);
+                const struct net_device_stats *stats = dev_get_stats(dev);
                 ret = sprintf(buf, fmt_ulong,
                               *(unsigned long *)(((u8 *) stats) + offset));
         }
@@ -428,6 +427,9 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)
         struct net_device *dev = to_net_dev(d);
         int retval;
 
+        if (!net_eq(dev_net(dev), &init_net))
+                return 0;
+
         /* pass interface to uevent. */
         retval = add_uevent_var(env, "INTERFACE=%s", dev->name);
         if (retval)
@@ -476,6 +478,10 @@ void netdev_unregister_kobject(struct net_device * net)
         struct device *dev = &(net->dev);
 
         kobject_get(&dev->kobj);
+
+        if (dev_net(net) != &init_net)
+                return;
+
         device_del(dev);
 }
 
@@ -490,7 +496,7 @@ int netdev_register_kobject(struct net_device *net)
         dev->groups = groups;
 
         BUILD_BUG_ON(BUS_ID_SIZE < IFNAMSIZ);
-        strlcpy(dev->bus_id, net->name, BUS_ID_SIZE);
+        dev_set_name(dev, net->name);
 
 #ifdef CONFIG_SYSFS
         *groups++ = &netstat_group;
@@ -501,6 +507,9 @@ int netdev_register_kobject(struct net_device *net)
 #endif
 #endif /* CONFIG_SYSFS */
 
+        if (dev_net(net) != &init_net)
+                return 0;
+
         return device_add(dev);
 }