From 33a01ab84b4db66b1b4560dd30c73ad3c4e9fd55 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 7 May 2019 16:32:12 +0200 Subject: [PATCH] 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) (cherry picked from commit 6f6914450072b79a91731e042e498ca26892696c) --- src/devices/nm-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index bae91276e1..2b9182211e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12800,7 +12800,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; }