]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: rewrite condition about DHCP in link_check_ready()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 3 May 2019 23:36:51 +0000 (01:36 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 4 May 2019 14:46:02 +0000 (16:46 +0200)
src/network/networkd-link.c

index 695c9e4bafa51ab3b1ff7f835df697c46c7af042..52577f526933704ad39af506c831db523fef6471 100644 (file)
@@ -1021,12 +1021,9 @@ void link_check_ready(Link *link) {
             in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address))
                 return;
 
-        if ((link_dhcp4_enabled(link) && !link_dhcp6_enabled(link) &&
-             !link->dhcp4_configured) ||
-            (link_dhcp6_enabled(link) && !link_dhcp4_enabled(link) &&
-             !link->dhcp6_configured) ||
-            (link_dhcp4_enabled(link) && link_dhcp6_enabled(link) &&
-             !link->dhcp4_configured && !link->dhcp6_configured))
+        if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
+            !(link->dhcp4_configured || link->dhcp6_configured))
+                /* When DHCP is enabled, at least one protocol must provide an address. */
                 return;
 
         if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)