]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: ndisc: do not set configured flags when addresses or routes are not assigned yet
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 21 Jul 2020 21:03:10 +0000 (06:03 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 28 Jul 2020 17:05:05 +0000 (02:05 +0900)
Just for safety.

src/network/networkd-ndisc.c

index a91c09999677ec5eccb71aea9b89d22e7c805273..dcfe3e726ca529c04f88b0b77101c9e08a7f5003 100644 (file)
@@ -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");