]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: ndisc - consider configured on timeout 1932/head
authorTom Gundersen <teg@jklm.no>
Tue, 17 Nov 2015 14:32:39 +0000 (15:32 +0100)
committerTom Gundersen <teg@jklm.no>
Tue, 17 Nov 2015 14:39:27 +0000 (15:39 +0100)
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

index 126f9c0fe9896854bda915cc81eff8e5bdc5b8c0..2ff87c32eb0ca1e065e0585f5c373f2830694585 100644 (file)
@@ -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;