SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: rewrite condition about DHCP in link_check_ready()

Browse Source
This commit is contained in:
Yu Watanabe
2019-05-04 16:46:02 +02:00
parent 8bc17bb3f7
commit 552081a499
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+3 -6
View 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)