diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:25:55 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-02-26 16:25:55 +0100 |
| commit | ee7b95167028fdbb2a4bd32aa686e27817d8dfe0 (patch) | |
| tree | f7a1abab0400789979f860dda724247a9bbbdef1 /clients/tui | |
| parent | c1b3616485604f3fddfad9521cb8818cd8eece2b (diff) | |
| parent | e536d40eaea5dcdc0743b0a5e8e17faa46608a50 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'clients/tui')
| -rw-r--r-- | clients/tui/nmt-device-entry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index 67a66f72..4ab59329 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -103,7 +103,7 @@ device_entry_parse (NmtDeviceEntry *deventry, return TRUE; if (priv->hardware_type == G_TYPE_NONE && !priv->device_filter) { - if (nm_utils_is_valid_iface_name (text, NULL)) { + if (nm_utils_ifname_valid_kernel (text, NULL)) { *interface_name = g_strdup (text); return TRUE; } else @@ -127,12 +127,12 @@ device_entry_parse (NmtDeviceEntry *deventry, len = nm_utils_hwaddr_len (priv->arptype); if ( nm_utils_hwaddr_aton (words[0], buf, len) - && (!words[1] || nm_utils_is_valid_iface_name (words[1], NULL))) { + && (!words[1] || nm_utils_ifname_valid_kernel (words[1], NULL))) { *mac_address = words[0]; *interface_name = NULL; g_free (words); return TRUE; - } else if ( nm_utils_is_valid_iface_name (words[0], NULL) + } else if ( nm_utils_ifname_valid_kernel (words[0], NULL) && (!words[1] || nm_utils_hwaddr_aton (words[1], buf, len))) { *interface_name = words[0]; *mac_address = NULL; |