summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-07 13:00:01 +0100
committerTom Gundersen <teg@jklm.no>2014-12-08 18:38:55 +0100
commitca6038b89645c0c1bd547d6a420bf95eb3d6f4cc (patch)
tree98f05f25ad3e1f5df4a7f74cf48101089cc20ed7 /src/udev
parent285760fedfaf907deab967b4b071d20e146752b5 (diff)
udev: link-config - simplify net-match
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/net/link-config.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 812325000d..bf24f6a7f7 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -246,7 +246,7 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
(void)safe_atou8(attr_value, &name_assign_type);
if (name_assign_type == NET_NAME_ENUM) {
- log_warning("Config file %s applies to device based on potentially unstable interface name '%s'",
+ log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'",
link->filename, udev_device_get_sysname(device));
*ret = link;
@@ -254,22 +254,17 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
} else if (name_assign_type == NET_NAME_RENAMED) {
log_warning("Config file %s matches device based on renamed interface name '%s', ignoring",
link->filename, udev_device_get_sysname(device));
- } else {
- log_debug("Config file %s applies to device %s",
- link->filename, udev_device_get_sysname(device));
-
- *ret = link;
- return 0;
+ continue;
}
- } else {
- log_debug("Config file %s applies to device %s",
- link->filename, udev_device_get_sysname(device));
+ }
- *ret = link;
+ log_debug("Config file %s applies to device %s",
+ link->filename, udev_device_get_sysname(device));
- return 0;
- }
+ *ret = link;
+
+ return 0;
}
}