diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-07 16:32:12 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-08 13:44:26 +0200 |
| commit | 6f6914450072b79a91731e042e498ca26892696c (patch) | |
| tree | 27a3fb165cd50ebaccdaffb9237eb42ff7e3059d | |
| parent | 4482ca64ba5bbf1c173ea5b4a3854da0173542a8 (diff) | |
| download | NetworkManager-6f6914450072b79a91731e042e498ca26892696c.tar.gz | |
device: fix intersecting IPv6 configurations
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.
(cherry picked from commit 18d2edfaa13d97597ddf5551e6dd5ea854f1fdbf)
| -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 bd55526ede..60709c50d5 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12882,7 +12882,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; } |