diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-12-14 11:27:02 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-12-14 11:27:02 +0100 |
| commit | ff0e1f4e5d897a0ddbf365e920c0e28a6657abaa (patch) | |
| tree | 35436cbfff494af264646e8d6358baba17418713 /udev | |
| parent | 14996e80d4b002dbbef9721b936fe29155375fb1 (diff) | |
check ifindex > 0 instead of subsystem == "net"
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-event.c | 2 | ||||
| -rw-r--r-- | udev/udev-rules.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c index f41f06b16a..02a1767b1f 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -564,7 +564,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) udev_rules_apply_to_event(rules, event); /* rename a new network interface, if needed */ - if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0 && + if (udev_device_get_ifindex(dev) > 0 && strcmp(udev_device_get_action(dev), "add") == 0 && event->name != NULL && strcmp(event->name, udev_device_get_sysname(dev)) != 0) { char syspath[UTIL_PATH_SIZE]; char *pos; diff --git a/udev/udev-rules.c b/udev/udev-rules.c index ab7b6aedb9..6b473c4c2e 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -2080,7 +2080,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) && (major(udev_device_get_devnum(event->dev)) > 0 || - strcmp(udev_device_get_subsystem(event->dev), "net") == 0)); + udev_device_get_ifindex(event->dev) > 0)); /* loop through token list, match, run actions or forward to next rule */ cur = &rules->tokens[0]; |