From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 25 Oct 2018 01:09:19 +0000 (+0900)
Subject: network,udev: drop unnecessary check whether ifindex is positive
X-Git-Tag: v240~453^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7606377e2ce156681fb6c51a117846d61c650e9e;p=thirdparty%2Fsystemd.git

network,udev: drop unnecessary check whether ifindex is positive

As sd_device_get_ifindex() now returns positive ifindex when it
succeeds.
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 4a621950caf..f7e9b486096 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -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;
         }
 
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 2d25f753575..c39d8791f2a 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -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;