fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 15:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

policy: remove redundant check in device_autoconnect_changed()

Browse source 
schedule_activate_check() also checks for nm_device_autoconnect_allowed()
and aborts if there is nothing to do.

(cherry picked from commit 990af413ac)
This commit is contained in:
Thomas Haller 2017-11-02 16:39:42 +01:00
parent d0f82352ea
commit d8bb62c909
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-policy.c
View file

@ -1159,8 +1159,7 @@ activate_data_free (ActivateData *data)
nm_device_remove_pending_action (data->device, NM_PENDING_ACTION_AUTOACTIVATE, TRUE);
priv->pending_activation_checks = g_slist_remove (priv->pending_activation_checks, data);
if (data->autoactivate_id)
g_source_remove (data->autoactivate_id);
nm_clear_g_source (&data->autoactivate_id);
g_object_unref (data->device);
g_slice_free (ActivateData, data);
@ -1996,8 +1995,7 @@ device_autoconnect_changed (NMDevice *device,
NMPolicyPrivate *priv = user_data;
NMPolicy *self = _PRIV_TO_SELF (priv);
if (nm_device_autoconnect_allowed (device))
schedule_activate_check (self, device);
schedule_activate_check (self, device);
}
static void