mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-18 09:40:39 +02:00
manager: allow controller activation if device is deactivating
When activating a port connection it will require the controller connection is active or a valid controller device candidate is available for activation. One of the conditions we consider for a controller device to be a valid candidate for the connection is that it is not active, therefore we should also consider as valid a device that is currently deactivating. Otherwise, we could fail during the port activation just because the deactivation of the controller device candidate didn't finish yet. https://bugzilla.redhat.com/show_bug.cgi?id=2125615 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1693
This commit is contained in:
parent
d441f846b2
commit
fb362e0583
1 changed files with 3 additions and 1 deletions
|
|
@ -5212,7 +5212,9 @@ ensure_master_active_connection(NMManager *self,
|
|||
continue;
|
||||
|
||||
if (nm_device_is_real(candidate)
|
||||
&& nm_device_get_state(candidate) != NM_DEVICE_STATE_DISCONNECTED)
|
||||
&& !NM_IN_SET(nm_device_get_state(candidate),
|
||||
NM_DEVICE_STATE_DISCONNECTED,
|
||||
NM_DEVICE_STATE_DEACTIVATING))
|
||||
continue;
|
||||
|
||||
master_ac = nm_manager_activate_connection(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue