libnm: allow addition of wireless connections to bonds in nm_utils_check_virtual_device_compatibility()

https://gitlab.gnome.org/GNOME/network-manager-applet/-/issues/140

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/969
This commit is contained in:
Christian Glombek 2021-08-24 23:25:49 +00:00 committed by Thomas Haller
parent 012158f53e
commit 9c2d835e5c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728

View file

@ -4603,8 +4603,9 @@ nm_utils_check_virtual_device_compatibility(GType virtual_type, GType other_type
if (virtual_type == NM_TYPE_SETTING_BOND) {
return (other_type == NM_TYPE_SETTING_INFINIBAND || other_type == NM_TYPE_SETTING_WIRED
|| other_type == NM_TYPE_SETTING_BRIDGE || other_type == NM_TYPE_SETTING_BOND
|| other_type == NM_TYPE_SETTING_TEAM || other_type == NM_TYPE_SETTING_VLAN);
|| other_type == NM_TYPE_SETTING_WIRELESS || other_type == NM_TYPE_SETTING_BRIDGE
|| other_type == NM_TYPE_SETTING_BOND || other_type == NM_TYPE_SETTING_TEAM
|| other_type == NM_TYPE_SETTING_VLAN);
} else if (virtual_type == NM_TYPE_SETTING_BRIDGE) {
return (other_type == NM_TYPE_SETTING_WIRED || other_type == NM_TYPE_SETTING_BOND
|| other_type == NM_TYPE_SETTING_TEAM || other_type == NM_TYPE_SETTING_VLAN);