fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 06:38:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: move nm_device_get_enabled() from schedule_activate_check() to nm_device_autoconnect_allowed()

Browse source
This commit is contained in:
Thomas Haller 2017-11-02 16:33:30 +01:00
parent 9a7e668dbb
commit fc18ff30cf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/devices/nm-device.c
View file

@ -4304,6 +4304,9 @@ nm_device_autoconnect_allowed (NMDevice *self)
&& !klass->get_autoconnect_allowed (self)) && !klass->get_autoconnect_allowed (self))
return FALSE; return FALSE;
if (!nm_device_get_enabled (self))
return FALSE;
/* Unrealized devices can always autoconnect. */ /* Unrealized devices can always autoconnect. */
if (nm_device_is_real (self) && priv->state < NM_DEVICE_STATE_DISCONNECTED) if (nm_device_is_real (self) && priv->state < NM_DEVICE_STATE_DISCONNECTED)
return FALSE; return FALSE;

3
src/nm-policy.c
View file

@ -1517,9 +1517,6 @@ schedule_activate_check (NMPolicy *self, NMDevice *device)
if (nm_manager_get_state (priv->manager) == NM_STATE_ASLEEP) if (nm_manager_get_state (priv->manager) == NM_STATE_ASLEEP)
return; return;
if (!nm_device_get_enabled (device))
return;
if (!nm_device_autoconnect_allowed (device)) if (!nm_device_autoconnect_allowed (device))
return; return;