From 6d4592354fc118ff7206cfc672a04c07022fe78c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 20 Jun 2019 17:14:30 +0200 Subject: [PATCH] settings: reorder checks in _delete_volatile_connection_do() to perform cheaper check first Checking whether a settings connection is still tracked is a simple c_list_is_empty(). It's faster, so do it first. --- src/nm-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index e876268891..9dfc84c979 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -817,14 +817,14 @@ _delete_volatile_connection_do (NMManager *self, if (!NM_FLAGS_HAS (nm_settings_connection_get_flags (connection), NM_SETTINGS_CONNECTION_INT_FLAGS_VOLATILE)) return; + if (!nm_settings_has_connection (priv->settings, connection)) + return; if (active_connection_find (self, connection, NULL, NM_ACTIVE_CONNECTION_STATE_DEACTIVATED, NULL)) return; - if (!nm_settings_has_connection (priv->settings, connection)) - return; _LOGD (LOGD_DEVICE, "volatile connection disconnected. Deleting connection '%s' (%s)", nm_settings_connection_get_id (connection), nm_settings_connection_get_uuid (connection));