From 962b0647298b601548b049893931d2477f06ab57 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 17 Nov 2015 15:32:39 +0100 Subject: 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. --- src/network/networkd-ndisc.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') 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; -- cgit v1.2.3-54-g00ecf