shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-29 04:55:36 +03:00
Code

Merge pull request #1373 from pfl/dhcp6_opportunistic_configuration

Browse Source 
networkd: Be opportunistic when declaring link configured
This commit is contained in:
Martin Pitt 2015-09-27 09:42:06 +02:00
commit ad1dc5ca46
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/networkd-link.c
View File

@ -501,10 +501,12 @@ void link_client_handler(Link *link) {
!link->ipv4ll_route)
return;
if (link_dhcp4_enabled(link) && !link->dhcp4_configured)
return;
if (link_dhcp6_enabled(link) && !link->dhcp6_configured)
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))
return;
if (link->state != LINK_STATE_CONFIGURED)