diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2020-01-30 09:16:43 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2020-01-30 09:39:09 +0100 |
| commit | 1c75474d07d654fd1731e6f1efb9960a8b0d26cb (patch) | |
| tree | ad7eaad8b4e08cf866e4135a405776614ab6c95b | |
| parent | 003753e9ae4d6990d6a29c574dd2f6e33ee57dac (diff) | |
| download | NetworkManager-bg/dhcp-timeout-rh1791378.tar.gz | |
ndisc: remove upper bound for IPv6 autoconfiguration timeoutbg/dhcp-timeout-rh1791378
As it is possible to configure an arbitrarily large DHCP timeout, it
should be possible to also set a large timeout for IPv6
autoconfiguration. Currently the timeout can only be changed via
sysctl. Leave the lower bound because the default kernel sysctl value
is 3 * 4 = 12 seconds and so without the lower limit the default
timeout would change from 30 to 12 seconds for every user, which seems
a big change and could possibly break users' setup.
https://bugzilla.redhat.com/show_bug.cgi?id=1795957
| -rw-r--r-- | src/ndisc/nm-ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c index e6174a99b6..d9a6d55a85 100644 --- a/src/ndisc/nm-ndisc.c +++ b/src/ndisc/nm-ndisc.c @@ -923,7 +923,7 @@ nm_ndisc_start (NMNDisc *ndisc) switch (priv->node_type) { case NM_NDISC_NODE_TYPE_HOST: ra_wait_secs = (((gint64) priv->router_solicitations) * priv->router_solicitation_interval) + 1; - ra_wait_secs = CLAMP (ra_wait_secs, 30, 120); + ra_wait_secs = MAX (ra_wait_secs, 30); priv->ra_timeout_id = g_timeout_add_seconds (ra_wait_secs, ndisc_ra_timeout_cb, ndisc); _LOGD ("scheduling RA timeout in %d seconds", (int) ra_wait_secs); solicit_routers (ndisc); |