summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2024-04-17 05:21:44 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-04-17 06:23:44 +0200
commit31db4c1bd5051b5cb2419176847baae1fb69b855 (patch)
tree7b1a689be3413bfdd6d958063a0525d7b21521da
parentMerge pull request #32300 from mrc0mmand/assorted-tweaks (diff)
downloadsystemd-31db4c1bd5051b5cb2419176847baae1fb69b855.tar.xz
systemd-31db4c1bd5051b5cb2419176847baae1fb69b855.zip
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.
-rw-r--r--src/libsystemd-network/sd-ndisc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index b4136563e1..eef3e8b913 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",