summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-11-17 15:32:39 +0100
committerTom Gundersen <teg@jklm.no>2015-11-17 15:39:27 +0100
commit962b0647298b601548b049893931d2477f06ab57 (patch)
tree3c2d5979757f64797995589e64a11ac86f06f496
parent233f353a2201e58d3861390be579f87097f05eb3 (diff)
networkd: ndisc - consider configured on timeout
Don't block indefinitely, when control has been passed on from NDisc to DHCPv6. In this case there is likely no IPv6 support on the local link, so otherwise this would block indefinitely.
-rw-r--r--src/network/networkd-ndisc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 126f9c0fe9..2ff87c32eb 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -207,6 +207,10 @@ static void ndisc_handler(sd_ndisc *nd, int event, void *userdata) {
r = sd_dhcp6_client_start(link->dhcp6_client);
if (r < 0 && r != -EALREADY)
log_link_warning_errno(link, r, "Starting DHCPv6 client after NDisc timeout failed: %m");
+
+ link->ndisc_configured = true;
+ link_check_ready(link);
+
break;
case SD_NDISC_EVENT_STOP:
break;