X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=1eebd61cc56fc56c7c3c6dbeede8edc7b274f3e2;hp=b680246bf8e035945bf82d01a96f4e3e16a278d6;hb=c0c865d4664ea10309b0ffc12b2fad19ecb98129;hpb=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4

diff --git a/udev_device.c b/udev_device.c
index b680246bf..1eebd61cc 100644
--- 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);
 }
@@ -124,16 +122,17 @@ static int rename_netif(struct udevice *udev)
 		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);
+			retval = ioctl(sk, SIOCSIFNAME, &ifr);
+			if (retval == 0)
+				break;
+
+			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);
 		}
 	}