|
 |
ab7d06 |
From 3379fa4525438a8e569ed0777a8503a34816e9fe Mon Sep 17 00:00:00 2001
|
|
|
ab7d06 |
From: Dan Williams <dcbw@redhat.com>
|
|
|
ab7d06 |
Date: Thu, 17 Sep 2015 09:55:23 -0500
|
|
|
ab7d06 |
Subject: [PATCH] device: increase IPv6LL DAD timeout (rh #1101809)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
Depending on the network and the values of the 'dad_transmits' and
|
|
|
ab7d06 |
'retrans_timeout_ms' sysctls, DAD for the IPv6LL address can take
|
|
|
ab7d06 |
quite a while. Obviously there must be some upper bound on the
|
|
|
ab7d06 |
timeout, but 5 seconds seems a bit low. In this case it was observed
|
|
|
ab7d06 |
to be ~12 seconds but the sysctl values are unknown. In any case,
|
|
|
ab7d06 |
we can't predict the network/config so being a bit more lenient here
|
|
|
ab7d06 |
makes sense.
|
|
|
ab7d06 |
|
|
|
ab7d06 |
https://bugzilla.redhat.com/show_bug.cgi?id=1101809
|
|
|
ab7d06 |
---
|
|
|
ab7d06 |
src/devices/nm-device.c | 7 ++++++-
|
|
|
ab7d06 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
|
|
|
ab7d06 |
index 22a235d..51cb4e6 100644
|
|
|
ab7d06 |
--- a/src/devices/nm-device.c
|
|
|
ab7d06 |
+++ b/src/devices/nm-device.c
|
|
|
ab7d06 |
@@ -4694,7 +4694,12 @@ linklocal6_start (NMDevice *self)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
check_and_add_ipv6ll_addr (self);
|
|
|
ab7d06 |
|
|
|
ab7d06 |
- priv->linklocal6_timeout_id = g_timeout_add_seconds (5, linklocal6_timeout_cb, self);
|
|
|
ab7d06 |
+ /* Depending on the network and what the 'dad_transmits' and 'retrans_time_ms'
|
|
|
ab7d06 |
+ * sysctl values are, DAD for the IPv6LL address may take quite a while.
|
|
|
ab7d06 |
+ * FIXME: use dad/retrans sysctl values if they are higher than a minimum time.
|
|
|
ab7d06 |
+ * (rh #1101809)
|
|
|
ab7d06 |
+ */
|
|
|
ab7d06 |
+ priv->linklocal6_timeout_id = g_timeout_add_seconds (15, linklocal6_timeout_cb, self);
|
|
|
ab7d06 |
|
|
|
ab7d06 |
return NM_ACT_STAGE_RETURN_POSTPONE;
|
|
|
ab7d06 |
}
|
|
|
ab7d06 |
--
|
|
|
ab7d06 |
2.1.0
|
|
|
ab7d06 |
|