1 files changed, 19 insertions, 7 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 90e2177af081..c1f4e0d428c0 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -242,11 +242,11 @@ static ssize_t netstat_show(const struct device *d,
                         offset % sizeof(unsigned long) != 0);
 
         read_lock(&dev_base_lock);
-        if (dev_isalive(dev) && dev->get_stats &&
-            (stats = (*dev->get_stats)(dev)))
+        if (dev_isalive(dev)) {
+                stats = dev->get_stats(dev);
                 ret = sprintf(buf, fmt_ulong,
                               *(unsigned long *)(((u8 *) stats) + offset));
-
+        }
         read_unlock(&dev_base_lock);
         return ret;
 }
@@ -318,7 +318,7 @@ static struct attribute_group netstat_group = {
         .attrs  = netstat_attrs,
 };
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT_SYSFS
 /* helper function that does all the locking etc for wireless stats */
 static ssize_t wireless_show(struct device *d, char *buf,
                              ssize_t (*format)(const struct iw_statistics *,
@@ -457,10 +457,9 @@ int netdev_register_kobject(struct net_device *net)
         strlcpy(dev->bus_id, net->name, BUS_ID_SIZE);
 
 #ifdef CONFIG_SYSFS
-        if (net->get_stats)
-                *groups++ = &netstat_group;
+        *groups++ = &netstat_group;
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT_SYSFS
         if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
                 *groups++ = &wireless_group;
 #endif
@@ -469,6 +468,19 @@ int netdev_register_kobject(struct net_device *net)
         return device_add(dev);
 }
 
+int netdev_class_create_file(struct class_attribute *class_attr)
+{
+        return class_create_file(&net_class, class_attr);
+}
+
+void netdev_class_remove_file(struct class_attribute *class_attr)
+{
+        class_remove_file(&net_class, class_attr);
+}
+
+EXPORT_SYMBOL(netdev_class_create_file);
+EXPORT_SYMBOL(netdev_class_remove_file);
+
 void netdev_initialize_kobject(struct net_device *net)
 {
         struct device *device = &(net->dev);