diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
| commit | 08984bbd9d6c7c8a033c7d1466c25a34bcc21c0d (patch) | |
| tree | 53671bf0bb9d3f465b02a1bc149512a210da34a1 /src/devices/nm-device.c | |
| parent | 0d06e842e34adca9a743de93979a7432961257c6 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Update upstream source from tag 'upstream/1.12.2'
Update to upstream version '1.12.2' with Debian dir 31e4999680481a4db05a3c008df492a8905a4ab3
Diffstat (limited to 'src/devices/nm-device.c')
| -rw-r--r-- | src/devices/nm-device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5a5cb50e..19e43762 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -10225,6 +10225,8 @@ _cleanup_ip_pre (NMDevice *self, int addr_family, CleanupType cleanup_type) arp_cleanup (self); dnsmasq_cleanup (self); ipv4ll_cleanup (self); + g_slist_free_full (priv->acd.dad_list, (GDestroyNotify) nm_acd_manager_destroy); + priv->acd.dad_list = NULL; } else { g_slist_free_full (priv->dad6_failed_addrs, (GDestroyNotify) nmp_object_unref); priv->dad6_failed_addrs = NULL; @@ -15393,9 +15395,6 @@ dispose (GObject *object) g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (device_ipx_changed), self); g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (link_changed_cb), self); - g_slist_free_full (priv->acd.dad_list, (GDestroyNotify) nm_acd_manager_destroy); - priv->acd.dad_list = NULL; - arp_cleanup (self); nm_clear_g_signal_handler (nm_config_get (), &priv->config_changed_id); |