mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 02:57:58 +02:00
core: apply manual IPv6 configuration earlier when RA is also used (rh #1101809)
Reporter left SLAAC enabled (because it's default and requires being explicitly turned off) and added manual IPv6 address. They expected that address to be assigned very soon after starting the connection, but it was not assigned. This happened because NM waits for RA before assigning any IPv6 configuration, including the manually specified addresses. In the reporters case, there was no IPv6 router on the network, so NM waited indefinitely for a router advertisement and never applied any IPv6 configuration. It seems reasonable to apply any IPv6 configuration we have available, when we have it. We already apply RA configuration before starting DHCP, and apply DHCP configuration if/when we get that.
This commit is contained in:
parent
17e323fd22
commit
c69531041a
1 changed files with 4 additions and 0 deletions
|
|
@ -3627,6 +3627,10 @@ addrconf6_start_with_link_ready (NMDevice *self)
|
|||
}
|
||||
nm_rdisc_set_iid (priv->rdisc, iid);
|
||||
|
||||
/* Apply any manual configuration before starting RA */
|
||||
if (!ip6_config_merge_and_apply (self, TRUE, NULL))
|
||||
_LOGW (LOGD_IP6, "failed to apply manual IPv6 configuration");
|
||||
|
||||
nm_device_ipv6_sysctl_set (self, "accept_ra", "1");
|
||||
nm_device_ipv6_sysctl_set (self, "accept_ra_defrtr", "0");
|
||||
nm_device_ipv6_sysctl_set (self, "accept_ra_pinfo", "0");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue