summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-08-07 13:02:48 +0200
committerThomas Haller <thaller@redhat.com>2019-09-23 13:13:23 +0200
commit2a506d8a0964424a0df04319a629082969e4fe63 (patch)
tree4fd4f9de1f37153e15dcb658e0caef5cefbb6c4d
parent3e39d2a5861a162cd6afb92ff60bee71fb0b2517 (diff)
downloadNetworkManager-2a506d8a0964424a0df04319a629082969e4fe63.tar.gz
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.
-rw-r--r--src/settings/nm-settings.c6
1 files changed, 0 insertions, 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;