From a93653336b6aa7a9fa554fa77b9b845c67b0aa9c Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Wed, 9 Jun 2021 19:14:41 +0200 Subject: [PATCH] iwd: Don't add connection.interface-name by default This setting can't be handled IWD (e.g. during autoactivations performed by IWD) and although for manual activations NM will probably check it, there's no reason for the IWD backend to restrict new profiles to one interface plus when running IWD the udev permanent interface naming is likely to be broken. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/886 (cherry picked from commit 35a1d89a960555525e047583cd8ed5b7dfb6c942) --- src/core/devices/wifi/nm-device-iwd.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c index f57f8f8110..56338743fc 100644 --- a/src/core/devices/wifi/nm-device-iwd.c +++ b/src/core/devices/wifi/nm-device-iwd.c @@ -1045,16 +1045,15 @@ complete_connection(NMDevice * device, } ssid_utf8 = iwd_ssid_to_str(ssid); - nm_utils_complete_generic( - nm_device_get_platform(device), - connection, - NM_SETTING_WIRELESS_SETTING_NAME, - existing_connections, - ssid_utf8, - ssid_utf8, - NULL, - nm_setting_wireless_get_mac_address(s_wifi) ? NULL : nm_device_get_iface(device), - TRUE); + nm_utils_complete_generic(nm_device_get_platform(device), + connection, + NM_SETTING_WIRELESS_SETTING_NAME, + existing_connections, + ssid_utf8, + ssid_utf8, + NULL, + NULL, + TRUE); if (hidden) g_object_set(s_wifi, NM_SETTING_WIRELESS_HIDDEN, TRUE, NULL);