]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: rewrite condition to make it easier to understand
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 28 May 2019 14:11:55 +0000 (16:11 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 30 May 2019 13:31:44 +0000 (15:31 +0200)
src/network/networkd-link.c

index 9486329b9a9191c24828640406ee66a09a0dddc2..6613992a091f5fe043a7c24d676dc568f9f1498b 100644 (file)
@@ -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. */