fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "device: only deactivate when the master we've enslaved to goes away"

Browse source 
This reverts commit 0b712a0718.
This commit is contained in:
Lubomir Rintel 2022-06-02 13:27:43 +02:00
parent 97517e0688
commit 82a5af32d0
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/devices/nm-device.c
View file

@ -7924,9 +7924,6 @@ nm_device_slave_notify_release(NMDevice *self, NMDeviceStateReason reason)
g_return_if_fail(priv->master);
if (!priv->is_enslaved)
return;
if (priv->state > NM_DEVICE_STATE_DISCONNECTED && priv->state <= NM_DEVICE_STATE_ACTIVATED) {
switch (nm_device_state_reason_check(reason)) {
case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
@ -7956,12 +7953,14 @@ nm_device_slave_notify_release(NMDevice *self, NMDeviceStateReason reason)
} else
_LOGI(LOGD_DEVICE, "released from master device %s", nm_device_get_iface(priv->master));
priv->is_enslaved = FALSE;
if (priv->is_enslaved) {
priv->is_enslaved = FALSE;
_notify(self, PROP_MASTER);
_notify(self, PROP_MASTER);
nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->master)->ports_variant, g_variant_unref);
nm_gobject_notify_together(priv->master, PROP_PORTS, PROP_SLAVES);
nm_clear_pointer(&NM_DEVICE_GET_PRIVATE(priv->master)->ports_variant, g_variant_unref);
nm_gobject_notify_together(priv->master, PROP_PORTS, PROP_SLAVES);
}
}
/**