make rename_netif() error messages useful

[elogind.git] / udev_device.c

diff --git a/udev_device.c b/udev_device.c
index a7a8b13c96006826db200bda0b72bd2567d548ac..87f90c76769b714320381368ab9cf02649c2030e 100644 (file)
--- a/udev_device.c
+++ b/udev_device.c
@@ -81,7 +81,7 @@ dev_t udev_device_get_devt(struct udevice *udev)
        return makedev(0, 0);
 }
 
-static int rename_net_if(struct udevice *udev)
+static int rename_netif(struct udevice *udev)
 {
        int sk;
        struct ifreq ifr;
@@ -100,12 +100,45 @@ static int rename_net_if(struct udevice *udev)
        memset(&ifr, 0x00, sizeof(struct ifreq));
        strlcpy(ifr.ifr_name, udev->dev->kernel_name, IFNAMSIZ);
        strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
-
        retval = ioctl(sk, SIOCSIFNAME, &ifr);
-       if (retval != 0)
-               err("error changing net interface name: %s", strerror(errno));
-       close(sk);
+       if (retval != 0) {
+               int loop;
+
+               /* see if the destination interface name already exists */
+               if (errno != EEXIST) {
+                       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);
+               strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
+               retval = ioctl(sk, SIOCSIFNAME, &ifr);
+               if (retval != 0) {
+                       err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+                       goto exit;
+               }
 
+               /* wait 30 seconds for our target to become available */
+               strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
+               strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
+               loop = 30 * 20;
+               while (loop--) {
+                       retval = ioctl(sk, SIOCSIFNAME, &ifr);  
+                       if (retval != 0) {
+                               if (errno != EEXIST) {
+                                       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);
+                               usleep(1000 * 1000 / 20);
+                       }
+               }
+       }
+
+exit:
+       close(sk);
        return retval;
 }
 
@@ -114,7 +147,8 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
        int retval = 0;
 
        /* add device node */
-       if (major(udev->devt) != 0 && strcmp(udev->action, "add") == 0) {
+       if (major(udev->devt) != 0 &&
+           (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
                struct udevice *udev_old;
 
                dbg("device node add '%s'", udev->dev->devpath);
@@ -180,7 +214,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                if (strcmp(udev->name, udev->dev->kernel_name) != 0) {
                        char *pos;
 
-                       retval = rename_net_if(udev);
+                       retval = rename_netif(udev);
                        if (retval != 0)
                                goto exit;
                        info("renamed netif to '%s'", udev->name);