diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-09 14:42:05 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-09 14:42:05 +0200 |
| commit | 477263e37e50d31bcf364adb83c2ef261d0249e6 (patch) | |
| tree | 690e9a4eb2628c2da2801b4cbd6df3f8bd670593 | |
| parent | 59a244bdca6b7da3665ba3e2a120488259c88c95 (diff) | |
Revert "device: release slaves when an external device is going managed"lr/cancel-ip-state-with-activation-v3
This reverts commit 59a244bdca6b7da3665ba3e2a120488259c88c95.
| -rw-r--r-- | src/core/devices/nm-device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 3795e98d06..fb8d6f177f 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -7656,9 +7656,8 @@ slave_state_changed(NMDevice *slave, } if (release) { - configure = (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED - && nm_device_sys_iface_state_get(slave) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) - || nm_device_sys_iface_state_get(slave) == NM_DEVICE_SYS_IFACE_STATE_MANAGED; + configure = priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED + && nm_device_sys_iface_state_get(slave) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL; nm_device_master_release_slave(self, slave, |