]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network,udev: drop unnecessary check whether ifindex is positive
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 25 Oct 2018 01:09:19 +0000 (10:09 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 26 Oct 2018 22:03:39 +0000 (07:03 +0900)
As sd_device_get_ifindex() now returns positive ifindex when it
succeeds.

src/network/networkd-manager.c
src/udev/net/link-config.c

index 4a621950cafdc7b984dec32fef0644c68f0d7786..f7e9b48609642dc7a55ad3665eb53a5b22b2eae2 100644 (file)
@@ -197,8 +197,8 @@ static int manager_udev_process_link(sd_device_monitor *monitor, sd_device *devi
                 return 0;
 
         r = sd_device_get_ifindex(device, &ifindex);
-        if (r < 0 || ifindex <= 0) {
-                log_debug("Ignoring udev ADD event for device with invalid ifindex");
+        if (r < 0) {
+                log_debug_errno(r, "Ignoring udev ADD event for device without ifindex or with invalid ifindex: %m");
                 return 0;
         }
 
index 2d25f753575040e0dc68c7f60d3c7fbf2912fc2b..c39d8791f2a81bc8250a341e031a6e3678e901ed 100644 (file)
@@ -412,8 +412,6 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
         r = sd_device_get_ifindex(device, &ifindex);
         if (r < 0)
                 return log_device_warning_errno(device, r, "Could not find ifindex: %m");
-        if (ifindex <= 0)
-                return log_device_warning_errno(device, EINVAL, "Invalid ifindex '%d'", ifindex);
 
         if (ctx->enable_name_policy && config->name_policy) {
                 NamePolicy *policy;