From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 17 Apr 2024 03:21:44 +0000 (+0900)
Subject: sd-ndisc: disable one more timer event source
X-Git-Tag: v256-rc1~151^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31db4c1bd5051b5cb2419176847baae1fb69b855;p=thirdparty%2Fsystemd.git

sd-ndisc: disable one more timer event source

Otherwise, even if we have already received RA, timeout callback will be
called. Currently, networkd mostly does nothing on timeout, hence should
not change any effective behavior.

Follow-up for e7cb80474d4e580f7cc7c8645e1412e4a59f7588.
---

diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index b4136563e1f..eef3e8b913e 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -219,6 +219,7 @@ static int ndisc_handle_router(sd_ndisc *nd, ICMP6Packet *packet) {
                 return r;
 
         (void) event_source_disable(nd->timeout_event_source);
+        (void) event_source_disable(nd->timeout_no_ra);
 
         log_ndisc(nd, "Received Router Advertisement: flags %s preference %s lifetime %s",
                   rt->flags & ND_RA_FLAG_MANAGED ? "MANAGED" : rt->flags & ND_RA_FLAG_OTHER ? "OTHER" : "none",