use git-archive instead of git-tar-tree

[elogind.git] / udev_device.c

diff --git a/udev_device.c b/udev_device.c
index 3c4ac913ed8839abce78bc5939b3390b20bf2490..bc0b33077e274eedcaf913c11d0d3b27e0112f0d 100644 (file)
--- a/udev_device.c
+++ b/udev_device.c
@@ -1,6 +1,4 @@
 /*
- * udev_device.c - main udev data object
- *
  * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -70,13 +68,13 @@ void udev_device_cleanup(struct udevice *udev)
 dev_t udev_device_get_devt(struct udevice *udev)
 {
        const char *attr;
-       unsigned int major, minor;
+       unsigned int maj, min;
 
        /* read it from sysfs  */
        attr = sysfs_attr_get_value(udev->dev->devpath, "dev");
        if (attr != NULL) {
-               if (sscanf(attr, "%u:%u", &major, &minor) == 2)
-                       return makedev(major, minor);
+               if (sscanf(attr, "%u:%u", &maj, &min) == 2)
+                       return makedev(maj, min);
        }
        return makedev(0, 0);
 }
@@ -87,7 +85,7 @@ static int rename_netif(struct udevice *udev)
        struct ifreq ifr;
        int retval;
 
-       info("changing net interface name from '%s' to '%s'", udev->dev->kernel_name, udev->name);
+       info("changing net interface name from '%s' to '%s'", udev->dev->kernel, udev->name);
        if (udev->test_run)
                return 0;
 
@@ -98,7 +96,7 @@ static int rename_netif(struct udevice *udev)
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
-       strlcpy(ifr.ifr_name, udev->dev->kernel_name, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, udev->dev->kernel, IFNAMSIZ);
        strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
        retval = ioctl(sk, SIOCSIFNAME, &ifr);
        if (retval != 0) {
@@ -106,16 +104,16 @@ static int rename_netif(struct udevice *udev)
 
                /* see if the destination interface name already exists */
                if (errno != EEXIST) {
-                       err("error changing netif name: %s", strerror(errno));
+                       err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
                        goto exit;
                }
 
                /* free our own name, another process may wait for us */
-               strlcpy(ifr.ifr_newname, udev->dev->kernel_name, IFNAMSIZ);
+               strlcpy(ifr.ifr_newname, udev->dev->kernel, IFNAMSIZ);
                strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
                retval = ioctl(sk, SIOCSIFNAME, &ifr);
                if (retval != 0) {
-                       err("error changing netif name: %s", strerror(errno));
+                       err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
                        goto exit;
                }
 
@@ -127,7 +125,8 @@ static int rename_netif(struct udevice *udev)
                        retval = ioctl(sk, SIOCSIFNAME, &ifr);  
                        if (retval != 0) {
                                if (errno != EEXIST) {
-                                       err("error changing net interface name: %s", strerror(errno));
+                                       err("error changing net interface name %s to %s: %s",
+                                           ifr.ifr_name, ifr.ifr_newname, strerror(errno));
                                        break;
                                }
                                dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
@@ -147,7 +146,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 
        /* add device node */
        if (major(udev->devt) != 0 &&
-           (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "online") == 0)) {
+           (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
                struct udevice *udev_old;
 
                dbg("device node add '%s'", udev->dev->devpath);
@@ -210,7 +209,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                }
 
                /* look if we want to change the name of the netif */
-               if (strcmp(udev->name, udev->dev->kernel_name) != 0) {
+               if (strcmp(udev->name, udev->dev->kernel) != 0) {
                        char *pos;
 
                        retval = rename_netif(udev);
@@ -219,14 +218,14 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                        info("renamed netif to '%s'", udev->name);
 
                        /* export old name */
-                       setenv("INTERFACE_OLD", udev->dev->kernel_name, 1);
+                       setenv("INTERFACE_OLD", udev->dev->kernel, 1);
 
                        /* now fake the devpath, because the kernel name changed silently */
                        pos = strrchr(udev->dev->devpath, '/');
                        if (pos != NULL) {
                                pos[1] = '\0';
                                strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
-                               strlcpy(udev->dev->kernel_name, udev->name, sizeof(udev->dev->kernel_name));
+                               strlcpy(udev->dev->kernel, udev->name, sizeof(udev->dev->kernel));
                                setenv("DEVPATH", udev->dev->devpath, 1);
                                setenv("INTERFACE", udev->name, 1);
                        }
@@ -249,8 +248,8 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                        list_for_each_entry(name_loop, &udev->env_list, node)
                                putenv(name_loop->name);
                } else {
-                       dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel_name);
-                       strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
+                       dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel);
+                       strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
                }
 
                udev_rules_get_run(rules, udev);