X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_device.c;h=b680246bf8e035945bf82d01a96f4e3e16a278d6;hb=cea61f5c0303d7e2f0886688e789c091d7e4b9e2;hp=ab4965c3a1f35d9bde7efce763dec25e7547c229;hpb=3c9e5740eb326de81f9611a8b77ae843700b0a81;p=elogind.git

diff --git a/udev_device.c b/udev_device.c
index ab4965c3a..b680246bf 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -81,13 +81,13 @@ 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;
 	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,14 +98,47 @@ 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_name, udev->dev->kernel, 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, 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;
 }
 
@@ -115,7 +148,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);
@@ -178,23 +211,23 @@ 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_net_if(udev);
+			retval = rename_netif(udev);
 			if (retval != 0)
 				goto exit;
 			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);
 			}
@@ -217,8 +250,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);