From 2d1638bba95fa19f2e20caf016460eaecc8ee496 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 29 Jan 2016 14:31:36 -0600 Subject: [PATCH] core,dhcp: look for IPv6LL address in composite config It will only be in ext_ip6_config if it was added by the kernel, which isn't usually the case since NM handles IPv6LL address generation on new enough kernels. If the LL address isn't found, IPv6 configuration will never complete because DHCPv6 was started already but lack of an LL address bails out early without handling the error. Fixes: b8c2fc26c12d4732d112237c8210fef4255c43e7 --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index d1b5c0d7dd..84cf211e50 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5297,7 +5297,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) g_byte_array_append (tmp, hw_addr, hw_addr_len); } - ip6_config = priv->ext_ip6_config; + ip6_config = priv->ip6_config; for (i = 0; ip6_config && i < nm_ip6_config_get_num_addresses (ip6_config); i++) { const NMPlatformIP6Address *addr = nm_ip6_config_get_address (ip6_config, i);