fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 00:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: honor the @check_properties flag

Browse source
This commit is contained in:
Beniamino Galvani 2023-01-24 14:45:51 +01:00
parent 71ee9d9033
commit 99756757c8
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/devices/nm-device-infiniband.c
View file

@ -119,7 +119,7 @@ check_connection_compatible(NMDevice *device,
->check_connection_compatible(device, connection, check_properties, error))
return FALSE;
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
const char *mac;
const char *hw_addr;

2
src/core/devices/nm-device-ip-tunnel.c
View file

@ -523,7 +523,7 @@ check_connection_compatible(NMDevice *device,
return FALSE;
}
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
/* Check parent interface; could be an interface name or a UUID */
parent = nm_setting_ip_tunnel_get_parent(s_ip_tunnel);
if (parent && !nm_device_match_parent(device, parent)) {

2
src/core/devices/nm-device-macvlan.c
View file

@ -311,7 +311,7 @@ check_connection_compatible(NMDevice *device,
}
/* Before the device is realized some properties will not be set */
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
if (setting_mode_to_platform(nm_setting_macvlan_get_mode(s_macvlan)) != priv->props.mode) {
nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,

2
src/core/devices/nm-device-tun.c
View file

@ -298,7 +298,7 @@ check_connection_compatible(NMDevice *device,
->check_connection_compatible(device, connection, check_properties, error))
return FALSE;
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
switch (priv->props.type) {
case IFF_TUN:
mode = NM_SETTING_TUN_MODE_TUN;

2
src/core/devices/nm-device-vlan.c
View file

@ -316,7 +316,7 @@ check_connection_compatible(NMDevice *device,
->check_connection_compatible(device, connection, check_properties, error))
return FALSE;
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
s_vlan = nm_connection_get_setting_vlan(connection);
if (nm_setting_vlan_get_id(s_vlan) != priv->vlan_id) {

2
src/core/devices/nm-device-vrf.c
View file

@ -154,7 +154,7 @@ check_connection_compatible(NMDevice *device,
->check_connection_compatible(device, connection, check_properties, error))
return FALSE;
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
s_vrf = _nm_connection_get_setting(connection, NM_TYPE_SETTING_VRF);
if (priv->props.table != nm_setting_vrf_get_table(s_vrf)) {

2
src/core/devices/nm-device-vxlan.c
View file

@ -251,7 +251,7 @@ check_connection_compatible(NMDevice *device,
->check_connection_compatible(device, connection, check_properties, error))
return FALSE;
if (nm_device_is_real(device)) {
if (check_properties && nm_device_is_real(device)) {
s_vxlan = nm_connection_get_setting_vxlan(connection);
parent = nm_setting_vxlan_get_parent(s_vxlan);