From e2c9d3c36f9a2519e909c792bb273a34a5310685 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 2 Dec 2008 01:04:23 +0100 Subject: fix network interface name swapping --- udev/udev-event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udev/udev-event.c b/udev/udev-event.c index 32b45e9bac..bc692392d2 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -514,7 +514,7 @@ static int rename_netif(struct udev_event *event) /* wait 30 seconds for our target to become available */ util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); - util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ); + util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ); loop = 30 * 20; while (loop--) { err = ioctl(sk, SIOCSIFNAME, &ifr); @@ -529,7 +529,7 @@ static int rename_netif(struct udev_event *event) break; } dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n", - udev_device_get_devnode(dev), (30 * 20) - loop); + event->name, (30 * 20) - loop); usleep(1000 * 1000 / 20); } } -- cgit v1.2.3-54-g00ecf