From 2a506d8a0964424a0df04319a629082969e4fe63 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 7 Aug 2019 13:02:48 +0200 Subject: [PATCH] settings: drop redundant check from have_connection_for_device() have_connection_for_device() really should just call nm_device_check_connection_compatible(). Note that nm_device_check_connection_compatible() of course checks the connection type already, so this is redundant. --- src/settings/nm-settings.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 09de8de8ed..fdd5835c59 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -3362,12 +3362,6 @@ have_connection_for_device (NMSettings *self, NMDevice *device) /* Find a wired connection matching for the device, if any */ c_list_for_each_entry (sett_conn, &priv->connections_lst_head, _connections_lst) { NMConnection *connection = nm_settings_connection_get_connection (sett_conn); - const char *ctype; - - ctype = nm_connection_get_connection_type (connection); - if (!NM_IN_STRSET (ctype, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_PPPOE_SETTING_NAME)) - continue; if (!nm_device_check_connection_compatible (device, connection, NULL)) continue;