From: Tom Gundersen <teg@jklm.no>
Date: Tue, 17 Nov 2015 14:32:39 +0000 (+0100)
Subject: networkd: ndisc - consider configured on timeout
X-Git-Tag: v228~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1932%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 126f9c0fe98..2ff87c32eb0 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;