diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-20 12:46:02 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-29 16:43:10 +0200 |
| commit | f5b48bd97389df5b747b71dc83e09f51a3437c4d (patch) | |
| tree | 17d3ba7409e855a11643e5d43a3a5f25fe4f4397 | |
| parent | b86d8968d5f8b9b5a8e43da3bd77294527f268ef (diff) | |
| download | NetworkManager-f5b48bd97389df5b747b71dc83e09f51a3437c4d.tar.gz | |
device: split handling for dad6_failed_addrs and dad6_ip6_config in queued_ip_config_change()
There is no change in behavior, however don't handle dad6_failed_addrs
and dad6_ip6_config in the same block.
While both parts are related to IPv6 DAD, they do something rather
different:
- the first block, checks all candidates from dad6_failed_addrs whether
they actually indicate DAD failed, and handles them by notifying
NMNDisc about failed addresses.
- the second block, checks whether we have now all addresses from
dad6_ip6_config that we are waiting for.
Split the blocks.
(cherry picked from commit 3fcdba1a19176bfb3595ef4c2b948f604af5dd54)
| -rw-r--r-- | src/devices/nm-device.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5575019c60..e2003b57be 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12228,9 +12228,7 @@ static gboolean queued_ip_config_change (NMDevice *self, int addr_family) { NMDevicePrivate *priv; - gboolean need_ipv6ll = FALSE; const gboolean IS_IPv4 = (addr_family == AF_INET); - NMPlatform *platform; g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE); @@ -12263,6 +12261,9 @@ queued_ip_config_change (NMDevice *self, int addr_family) } if (!IS_IPv4) { + NMPlatform *platform; + gboolean need_ipv6ll = FALSE; + if ( priv->state < NM_DEVICE_STATE_DEACTIVATING && (platform = nm_device_get_platform (self)) && nm_platform_link_get (platform, priv->ifindex)) { @@ -12303,7 +12304,9 @@ queued_ip_config_change (NMDevice *self, int addr_family) g_slist_free_full (priv->dad6_failed_addrs, (GDestroyNotify) nmp_object_unref); priv->dad6_failed_addrs = NULL; } + } + if (!IS_IPv4) { /* Check if DAD is still pending */ if ( priv->ip6_state == IP_CONF && priv->dad6_ip6_config |