chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4894330
)
fix network interface name swapping
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 2 Dec 2008 00:04:23 +0000
(
01:04
+0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 2 Dec 2008 00:04:23 +0000
(
01:04
+0100)
udev/udev-event.c
patch
|
blob
|
history
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 32b45e9baca6c039932b4b875b4b03b15425d9a7..bc692392d2b128298f9e8b3ca7c8cbf98b564634 100644
(file)
--- 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);
/* 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);
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",
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);
}
}
usleep(1000 * 1000 / 20);
}
}