colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: guard the flag setting by the actual device presence

Browse Source 
The parent might be an active connection w/o the device being determined.
This commit is contained in:
Lubomir Rintel
2017-01-26 14:18:20 +01:00
parent 93b632a7fa
commit 59b497f0f0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nm-manager.c
View File

@@ -3126,8 +3126,10 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
* decides to go unmanaged while we're activating (perhaps because other slaves * decides to go unmanaged while we're activating (perhaps because other slaves
* go away leaving him with no kids). * go away leaving him with no kids).
*/ */
nm_device_set_unmanaged_by_flags (master_device, NM_UNMANAGED_EXTERNAL_DOWN, if (master_device) {
NM_UNMAN_FLAG_OP_FORGET, NM_DEVICE_STATE_REASON_USER_REQUESTED); nm_device_set_unmanaged_by_flags (master_device, NM_UNMANAGED_EXTERNAL_DOWN,
NM_UNMAN_FLAG_OP_FORGET, NM_DEVICE_STATE_REASON_USER_REQUESTED);
}
nm_active_connection_set_master (active, master_ac); nm_active_connection_set_master (active, master_ac);
_LOGD (LOGD_CORE, "Activation of '%s' depends on active connection %p %s", _LOGD (LOGD_CORE, "Activation of '%s' depends on active connection %p %s",