mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-08 11:19:16 +02:00
Revert "device: release slaves when an external device is going managed"
This reverts commit 59a244bdca.
This commit is contained in:
parent
59a244bdca
commit
477263e37e
1 changed files with 2 additions and 3 deletions
|
|
@ -7656,9 +7656,8 @@ slave_state_changed(NMDevice *slave,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (release) {
|
if (release) {
|
||||||
configure = (priv->sys_iface_state == 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_sys_iface_state_get(slave) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL;
|
||||||
|| nm_device_sys_iface_state_get(slave) == NM_DEVICE_SYS_IFACE_STATE_MANAGED;
|
|
||||||
|
|
||||||
nm_device_master_release_slave(self,
|
nm_device_master_release_slave(self,
|
||||||
slave,
|
slave,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue