From a508d0ad5ca8d52e9703e30525c2eb712a8cc9b4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Nov 2017 16:33:27 +0100 Subject: [PATCH] policy: minor code cleanup in activate_slave_connections() (cherry picked from commit 071495c754fa4610cf957641272377b689356701) --- src/nm-policy.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index 1b948acc3d..534dc343d4 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1579,15 +1579,13 @@ activate_slave_connections (NMPolicy *self, NMDevice *device) || nm_streq0 (slave_master, master_uuid_applied) || nm_streq0 (slave_master, master_uuid_settings)) { NMSettingsConnection *settings = NM_SETTINGS_CONNECTION (slave); - NMSettingsAutoconnectBlockedReason reason; if (!internal_activation) nm_settings_connection_autoconnect_retries_reset (settings); - reason = nm_settings_connection_autoconnect_blocked_reason_get (settings); - if (reason == NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED) { - reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE; - nm_settings_connection_autoconnect_blocked_reason_set (settings, reason); + if (nm_settings_connection_autoconnect_blocked_reason_get (settings) == NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED) { + nm_settings_connection_autoconnect_blocked_reason_set (settings, + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE); } } }