From 552081a4992e2d17a769c65b991c8f41b9802c12 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 4 May 2019 01:36:51 +0200 Subject: [PATCH] network: rewrite condition about DHCP in link_check_ready() --- src/network/networkd-link.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 695c9e4baf..52577f5269 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -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)