From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 21 Jul 2020 21:03:10 +0000 (+0900)
Subject: network: ndisc: do not set configured flags when addresses or routes are not assigned yet
X-Git-Tag: v246~14^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3336e946daab7417fc33170ca4d77581dd799748;p=thirdparty%2Fsystemd.git

network: ndisc: do not set configured flags when addresses or routes are not assigned yet

Just for safety.
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index a91c0999967..dcfe3e726ca 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -819,10 +819,11 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
 
         case SD_NDISC_EVENT_TIMEOUT:
                 log_link_debug(link, "NDisc handler get timeout event");
-                link->ndisc_addresses_configured = true;
-                link->ndisc_routes_configured = true;
-                link_check_ready(link);
-
+                if (link->ndisc_addresses_messages == 0 && link->ndisc_routes_messages == 0) {
+                        link->ndisc_addresses_configured = true;
+                        link->ndisc_routes_configured = true;
+                        link_check_ready(link);
+                }
                 break;
         default:
                 assert_not_reached("Unknown NDisc event");