diff options
| author | Christian Glombek <lorbus@fedoraproject.org> | 2021-08-24 23:25:49 +0000 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-08-25 08:19:01 +0200 |
| commit | 9c2d835e5c8d9768b20af63772be50a9f9f8f05f (patch) | |
| tree | e53647c843a7a0fec306366baedfef4029490316 | |
| parent | 012158f53ed6bb93f33cdb8e779411bd7a62152e (diff) | |
| download | NetworkManager-9c2d835e5c8d9768b20af63772be50a9f9f8f05f.tar.gz | |
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
| -rw-r--r-- | src/libnm-core-impl/nm-utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 04ae5f91b5..91aeacad3b 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -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); |