From 6c22f99219a848cd216d38cf70c8a2f926ab463f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 29 Nov 2017 09:37:05 +0100 Subject: [PATCH] policy: don't schedule_activate_all() when going to sleep This was added by cfb2af1df2f596cf1bb3653d091dac915db90387, but it's wrong. Here we reset the autoconnect-blocked-reasons when going to sleep, not when waking up. (cherry picked from commit 88549b031a59925312825b5f051c40a37420347b) --- src/nm-policy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index 82b9b89ff2..e2be351536 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1465,10 +1465,8 @@ sleeping_changed (NMManager *manager, GParamSpec *pspec, gpointer user_data) g_object_get (G_OBJECT (manager), NM_MANAGER_NETWORKING_ENABLED, &enabled, NULL); /* Reset retries on all connections so they'll checked on wakeup */ - if (sleeping || !enabled) { - if (reset_autoconnect_all (self, NULL, FALSE)) - schedule_activate_all (self); - } + if (sleeping || !enabled) + reset_autoconnect_all (self, NULL, FALSE); } static void