summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2022-06-20 09:38:58 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2022-06-22 18:05:55 +0200
commita216739e096c168e847afdb9cc1d14fa22501bb5 (patch)
tree6f6c44f6aacbc75e00a2a1a747cff2bf692d5ec6
parent3ee61f0913d3e8f4df6da66980f04d61c6d7d89b (diff)
downloadNetworkManager-a216739e096c168e847afdb9cc1d14fa22501bb5.tar.gz
device: stop ac6 grace time when ip6ll is ready in shared mode
The IPv6 shared mode starts IPv6 autoconf to send router advertisements. IPv6 autoconf schedules a 30-second timeout waiting for a link-local address to appear. When the link-local address appears, we need to cancel the timeout. Fixes: 58287cbcc0c8 ('core: rework IP configuration in NetworkManager using layer 3 configuration') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1030 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1266
-rw-r--r--src/core/devices/nm-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 344e706395..30055f109f 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -11513,8 +11513,8 @@ _dev_ipac6_start(NMDevice *self)
if (node_type == NM_NDISC_NODE_TYPE_ROUTER)
_dev_ipac6_set_state(self, NM_DEVICE_IP_STATE_READY);
- else
- _dev_ipac6_grace_period_start(self, ra_timeout, TRUE);
+
+ _dev_ipac6_grace_period_start(self, ra_timeout, TRUE);
nm_ndisc_start(priv->ipac6_data.ndisc);
}