From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 17 May 2019 00:14:59 +0000 (+0900)
Subject: network: tighten the condition whether link has carrier
X-Git-Tag: v243-rc1~412^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b26ea3080172365a3bbba01c313a335afb4a9e53;p=thirdparty%2Fsystemd.git

network: tighten the condition whether link has carrier

ip command requires that IFF_RUNNING is set for that the link has
carrier.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 6b4ed33932f..ac123ddc1eb 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1637,7 +1637,8 @@ bool link_has_carrier(Link *link) {
 
         if (link->kernel_operstate == IF_OPER_UNKNOWN)
                 /* operstate may not be implemented, so fall back to flags */
-                if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT))
+                if (FLAGS_SET(link->flags, IFF_LOWER_UP | IFF_RUNNING) &&
+                    !FLAGS_SET(link->flags, IFF_DORMANT))
                         return true;
 
         return false;