diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-07 16:32:12 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-08 10:07:18 +0200 |
| commit | 460d70cdfb2714f11bba043c478f799a8002b985 (patch) | |
| tree | edeef09c54d3bfe73a62e107fe0ea7ceea349b82 | |
| parent | 0a15cb2040ee94a33ddf4413e9f2e95356d6acd6 (diff) | |
| download | NetworkManager-bg/restore-ip6-addr-link-up-rh1548237.tar.gz | |
device: fix intersecting IPv6 configurationsbg/restore-ip6-addr-link-up-rh1548237
If the link is down we shouldn't drop the link-local address from
configuration as it wasn't removed by user but by kernel.
| -rw-r--r-- | src/devices/nm-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 41fc32288f..81e57621bb 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12924,7 +12924,8 @@ update_ext_ip_config (NMDevice *self, int addr_family, gboolean intersect_config for (iter = priv->vpn_configs_6; iter; iter = iter->next) nm_ip6_config_intersect (iter->data, priv->ext_ip_config_6, is_up, is_up, 0); - if ( priv->ipv6ll_has + if ( is_up + && priv->ipv6ll_has && !nm_ip6_config_lookup_address (priv->ext_ip_config_6, &priv->ipv6ll_addr)) priv->ipv6ll_has = FALSE; } |