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

all: use the new NMSettingConnection autoconnect-ports property

Browse source
This commit is contained in:
Fernando Fernandez Mancera 2024-01-24 12:40:44 +01:00
parent 194455660d
commit 8a08a74abf
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/devices/nm-device.c
View file

@ -13369,6 +13369,7 @@ can_reapply_change(NMDevice *self,
NM_SETTING_CONNECTION_STABLE_ID,
NM_SETTING_CONNECTION_AUTOCONNECT,
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
NM_SETTING_CONNECTION_AUTOCONNECT_PORTS,
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY,
NM_SETTING_CONNECTION_ZONE,
NM_SETTING_CONNECTION_METERED,

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

@ -5333,14 +5333,14 @@ find_slaves(NMManager *manager,
static gboolean
should_connect_slaves(NMConnection *connection, NMDevice *device)
{
NMSettingConnection *s_con;
NMSettingConnectionAutoconnectSlaves val;
NMSettingConnection *s_con;
NMTernary val;
s_con = nm_connection_get_setting_connection(connection);
g_assert(s_con);
val = nm_setting_connection_get_autoconnect_slaves(s_con);
if (val != NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT)
val = nm_setting_connection_get_autoconnect_ports(s_con);
if (val != NM_TERNARY_DEFAULT)
goto out;
val =
@ -5352,9 +5352,9 @@ should_connect_slaves(NMConnection *connection, NMDevice *device)
-1);
out:
if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO)
if (val == NM_TERNARY_FALSE)
return FALSE;
if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES)
if (val == NM_TERNARY_TRUE)
return TRUE;
return FALSE;
}