Driver core: notify userspace of network device renames

[mv-sheeva.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4cbb1290a6a34707c93b0ddfa040a06f1d1d47bf..e441ec7988c10244506dbde9e7c2d624bdebbed3 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -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);
@@ -421,6 +421,17 @@ static int netdev_uevent(struct device *d, char **envp,
        buf += n;
        size -= n;
 
+       if ((size <= 0) || (i >= num_envp))
+               return -ENOMEM;
+
+       /* pass ifindex to uevent.
+        * ifindex is useful as it won't change (interface name may change)
+        * and is what RtNetlink uses natively. */
+       envp[i++] = buf;
+       n = snprintf(buf, size, "IFINDEX=%d", dev->ifindex) + 1;
+       buf += n;
+       size -= n;
+
        if ((size <= 0) || (i >= num_envp))
                return -ENOMEM;