summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-09-27 09:42:06 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2015-09-27 09:42:06 +0200
commitad1dc5ca46590478e5f2a464042cbffb35d1132b (patch)
tree11f40f636878490dc1e97c8e4b5f486640ddcae7
parent049077a789afb7a2e17817f694e55acfaf48de39 (diff)
parent3ada37a21e3ce5913b952df555f487f88bdb59ea (diff)
Merge pull request #1373 from pfl/dhcp6_opportunistic_configuration
networkd: Be opportunistic when declaring link configured
-rw-r--r--src/network/networkd-link.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 5dd14b1104..db3975f466 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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)