From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 28 May 2019 14:11:55 +0000 (+0200)
Subject: networkd: rewrite condition to make it easier to understand
X-Git-Tag: v243-rc1~335^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2babfc2f5240019ca09a9c2ef026755b997adb4;p=thirdparty%2Fsystemd.git

networkd: rewrite condition to make it easier to understand
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 9486329b9a9..6613992a091 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -965,7 +965,8 @@ void link_check_ready(Link *link) {
                 return;
 
         if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
-            !(link->dhcp4_configured || link->dhcp6_configured) &&
+            !link->dhcp4_configured &&
+            !link->dhcp6_configured &&
             !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address && link->ipv4ll_route))
                 /* When DHCP is enabled, at least one protocol must provide an address, or
                  * an IPv4ll fallback address must be configured. */