From 150fe9eef8dd22307ee16687509acde616663982 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 12 Jun 2023 11:25:29 +0200 Subject: New upstream version 1.42.6 --- src/core/devices/nm-device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/core/devices/nm-device.c') diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 3565c04d..d080b540 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -10339,14 +10339,14 @@ _dev_ipdhcpx_notify(NMDhcpClient *client, const NMDhcpClientNotifyData *notify_d if (notify_data->lease_update.accepted) { nm_manager_write_device_state(priv->manager, self, NULL); + nm_dispatcher_call_device(NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4), + self, + NULL, + NULL, + NULL, + NULL); if (priv->ipdhcp_data_x[IS_IPv4].state != NM_DEVICE_IP_STATE_READY) { _dev_ipdhcpx_set_state(self, addr_family, NM_DEVICE_IP_STATE_READY); - nm_dispatcher_call_device(NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4), - self, - NULL, - NULL, - NULL, - NULL); _dev_ip_state_check_async(self, addr_family); } } @@ -14542,6 +14542,9 @@ _set_unmanaged_flags(NMDevice *self, if (transition_state) { new_state = was_managed ? NM_DEVICE_STATE_UNMANAGED : NM_DEVICE_STATE_UNAVAILABLE; + if (new_state == NM_DEVICE_STATE_UNMANAGED) { + _cancel_activation(self); + } if (now) nm_device_state_changed(self, new_state, reason); else -- cgit 1.3.0-6-gf8a5