From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 20 Jan 2022 20:05:04 +0000 (+0900)
Subject: resolve: use netif_has_carrier()
X-Git-Tag: v251-rc1~486^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12f45cbbbed26b185a36a718595d1c816fc9805f;p=thirdparty%2Fsystemd.git

resolve: use netif_has_carrier()
---

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index 344329f1899..30cf44afcbb 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -11,6 +11,7 @@
 #include "fileio.h"
 #include "log-link.h"
 #include "mkdir.h"
+#include "netif-util.h"
 #include "parse-util.h"
 #include "resolved-link.h"
 #include "resolved-llmnr.h"
@@ -699,9 +700,7 @@ bool link_relevant(Link *l, int family, bool local_multicast) {
                         return false;
         }
 
-        /* Check kernel operstate
-         * https://www.kernel.org/doc/Documentation/networking/operstates.txt */
-        if (!IN_SET(l->operstate, IF_OPER_UNKNOWN, IF_OPER_UP))
+        if (!netif_has_carrier(l->operstate, l->flags))
                 return false;
 
         (void) sd_network_link_get_operational_state(l->ifindex, &state);