Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 6189dc03108d2da67aad2a155a3d53011a30daa0..5c19b0646d7a3e09c0284a93686c2d738fc92fd1 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -340,7 +340,7 @@ static struct attribute_group netstat_group = {
        .attrs  = netstat_attrs,
 };
 
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
 /* 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 *,
@@ -352,8 +352,8 @@ static ssize_t wireless_show(struct device *d, char *buf,
 
        read_lock(&dev_base_lock);
        if (dev_isalive(dev)) {
-               if(dev->wireless_handlers &&
-                  dev->wireless_handlers->get_wireless_stats)
+               if (dev->wireless_handlers &&
+                   dev->wireless_handlers->get_wireless_stats)
                        iw = dev->wireless_handlers->get_wireless_stats(dev);
                if (iw != NULL)
                        ret = (*format)(iw, buf);
@@ -412,20 +412,25 @@ static int netdev_uevent(struct device *d, char **envp,
                         int num_envp, char *buf, int size)
 {
        struct net_device *dev = to_net_dev(d);
-       int i = 0;
-       int n;
+       int retval, len = 0, i = 0;
 
        /* pass interface to uevent. */
-       envp[i++] = buf;
-       n = snprintf(buf, size, "INTERFACE=%s", dev->name) + 1;
-       buf += n;
-       size -= n;
-
-       if ((size <= 0) || (i >= num_envp))
-               return -ENOMEM;
-
+       retval = add_uevent_var(envp, num_envp, &i,
+                               buf, size, &len,
+                               "INTERFACE=%s", dev->name);
+       if (retval)
+               goto exit;
+
+       /* pass ifindex to uevent.
+        * ifindex is useful as it won't change (interface name may change)
+        * and is what RtNetlink uses natively. */
+       retval = add_uevent_var(envp, num_envp, &i,
+                               buf, size, &len,
+                               "IFINDEX=%d", dev->ifindex);
+
+exit:
        envp[i] = NULL;
-       return 0;
+       return retval;
 }
 #endif
 
@@ -451,9 +456,15 @@ static struct class net_class = {
 #endif
 };
 
+/* Delete sysfs entries but hold kobject reference until after all
+ * netdev references are gone.
+ */
 void netdev_unregister_sysfs(struct net_device * net)
 {
-       device_del(&(net->dev));
+       struct device *dev = &(net->dev);
+
+       kobject_get(&dev->kobj);
+       device_del(dev);
 }
 
 /* Create sysfs entries for network device. */
@@ -473,7 +484,7 @@ int netdev_register_sysfs(struct net_device *net)
        if (net->get_stats)
                *groups++ = &netstat_group;
 
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
        if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
                *groups++ = &wireless_group;
 #endif