fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-18 22:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: cleanup nm_utils_check_virtual_device_compatibility()

Browse source
This commit is contained in:
Thomas Haller 2021-08-25 08:18:36 +02:00
parent 9c2d835e5c
commit beeff19f6c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/libnm-core-impl/nm-utils.c
View file

@ -4602,25 +4602,41 @@ nm_utils_check_virtual_device_compatibility(GType virtual_type, GType other_type
FALSE);
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_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);
} else if (virtual_type == NM_TYPE_SETTING_TEAM) {
return (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);
} else if (virtual_type == NM_TYPE_SETTING_VLAN) {
return (other_type == NM_TYPE_SETTING_WIRED || 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 {
g_warn_if_reached();
return FALSE;
return NM_IN_SET(other_type,
NM_TYPE_SETTING_BOND,
NM_TYPE_SETTING_BRIDGE,
NM_TYPE_SETTING_INFINIBAND,
NM_TYPE_SETTING_TEAM,
NM_TYPE_SETTING_VLAN,
NM_TYPE_SETTING_WIRED,
NM_TYPE_SETTING_WIRELESS);
}
if (virtual_type == NM_TYPE_SETTING_BRIDGE) {
return NM_IN_SET(other_type,
NM_TYPE_SETTING_BOND,
NM_TYPE_SETTING_TEAM,
NM_TYPE_SETTING_VLAN,
NM_TYPE_SETTING_WIRED);
}
if (virtual_type == NM_TYPE_SETTING_TEAM) {
return NM_IN_SET(other_type,
NM_TYPE_SETTING_BOND,
NM_TYPE_SETTING_BRIDGE,
NM_TYPE_SETTING_TEAM,
NM_TYPE_SETTING_VLAN,
NM_TYPE_SETTING_WIRED);
}
if (virtual_type == NM_TYPE_SETTING_VLAN) {
return NM_IN_SET(other_type,
NM_TYPE_SETTING_BOND,
NM_TYPE_SETTING_BRIDGE,
NM_TYPE_SETTING_TEAM,
NM_TYPE_SETTING_VLAN,
NM_TYPE_SETTING_WIRED,
NM_TYPE_SETTING_WIRELESS);
}
return FALSE;
}
/*****************************************************************************/