system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: branch 'bg/rh2101317'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1374
This commit is contained in:
Beniamino Galvani 2022-09-26 16:17:45 +02:00
parent ee0f3f6242 ed29863645
commit e1b8ab90de
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/nm-manager.c
View file

@ -1887,8 +1887,11 @@ find_parent_device_for_connection(NMManager *self,
* with some known device.
*/
c_list_for_each_entry (candidate, &priv->devices_lst_head, devices_lst) {
/* Unmanaged devices are not compatible with any connection */
if (!nm_device_get_managed(candidate, FALSE))
/* For a realized device, check that it's managed; otherwise it's not
* compatible with any connection. If the device is unrealized then
* the managed state is meaningless.
*/
if (nm_device_is_real(candidate) && !nm_device_get_managed(candidate, FALSE))
continue;
if (nm_device_get_settings_connection(candidate) == parent_connection)
@ -4710,8 +4713,10 @@ find_slaves(NMManager *manager,
}
nm_assert(n_slaves < n_all_connections);
slaves[n_slaves].connection = candidate, slaves[n_slaves].device = slave_device,
n_slaves++;
slaves[n_slaves++] = (SlaveConnectionInfo){
.connection = candidate,
.device = slave_device,
};
if (slave_device)
g_hash_table_add(devices, slave_device);