From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 18 Aug 2019 15:04:37 +0000 (+0900)
Subject: network: do not check deprecated flag in address_is_ready()
X-Git-Tag: v243-rc2~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce158189a86aa01f8c2ddeeaa2d2b88ecb1dcb8a;p=thirdparty%2Fsystemd.git

network: do not check deprecated flag in address_is_ready()

Without this change, the address with PreferredLifetime=0 cannot be ready,
and thus, no consequent setting up process does not start.
The bug was introduced by 6aa5773.

Follow-up for b7ed5384ab55cd4d7b8d7d1ec7f5d5e145f0a2b1.

Fixes #13341.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index e6f30a28423..885cda3a035 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -978,10 +978,7 @@ int config_parse_address_scope(const char *unit,
 bool address_is_ready(const Address *a) {
         assert(a);
 
-        if (a->family == AF_INET6)
-                return !(a->flags & IFA_F_TENTATIVE);
-        else
-                return !(a->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED));
+        return !(a->flags & IFA_F_TENTATIVE);
 }
 
 int address_section_verify(Address *address) {