diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-03-09 16:17:31 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-03-20 15:24:38 +0100 |
| commit | a58d4f5d3f62b2bf0bec615370c3d98b35c06c27 (patch) | |
| tree | 5569d707423775062bbebfc524b2cb45e0402a0a | |
| parent | 945339cba53ab25fdd3eaded56eec35312f94867 (diff) | |
| download | NetworkManager-a58d4f5d3f62b2bf0bec615370c3d98b35c06c27.tar.gz | |
device: use nm_ip6_config_find_first_address() in check_and_add_ipv6ll_addr()
| -rw-r--r-- | src/devices/nm-device.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 8d79738302..a82deb4fe3 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7470,17 +7470,13 @@ check_and_add_ipv6ll_addr (NMDevice *self) if (!priv->ipv6ll_handle) return; - if (priv->ext_ip6_config_captured) { - NMDedupMultiIter ipconf_iter; - const NMPlatformIP6Address *addr; - - nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, priv->ext_ip6_config_captured, &addr) { - if ( IN6_IS_ADDR_LINKLOCAL (&addr->address) - && !(addr->n_ifa_flags & IFA_F_DADFAILED)) { - /* Already have an LL address, nothing to do */ - return; - } - } + if ( priv->ext_ip6_config_captured + && nm_ip6_config_find_first_address (priv->ext_ip6_config_captured, + NM_PLATFORM_MATCH_WITH_ADDRTYPE_LINKLOCAL + | NM_PLATFORM_MATCH_WITH_ADDRSTATE_NORMAL + | NM_PLATFORM_MATCH_WITH_ADDRSTATE_TENTATIVE)) { + /* Already have an LL address, nothing to do */ + return; } memset (&lladdr, 0, sizeof (lladdr)); |