fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 13:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi/iwd: merge branch 'verdre:iwd-backend-fixes'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/828
This commit is contained in:
Thomas Haller 2021-04-27 19:53:14 +02:00
commit 2c9924482a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/devices/wifi/nm-iwd-manager.c
View file

@ -491,7 +491,7 @@ sett_conn_changed(NMSettingsConnection * sett_conn,
gboolean nm_autoconnectable = nm_setting_connection_get_autoconnect(s_conn);
gboolean iwd_autoconnectable = get_property_bool(data->known_network, "AutoConnect", TRUE);
if (iwd_autoconnectable == nm_autoconnectable) {
if (iwd_autoconnectable != nm_autoconnectable) {
nm_log_dbg(LOGD_WIFI,
"iwd: updating AutoConnect on known network at %s based on connection %s",
g_dbus_proxy_get_object_path(data->known_network),
@ -742,7 +742,9 @@ mirror_connection(NMIwdManager * self,
g_object_set(G_OBJECT(s_wifi), NM_SETTING_WIRELESS_HIDDEN, hidden, NULL);
} else {
KnownNetworkData data = {known_network, settings_connection, id};
sett_conn_changed(settings_connection, 0, &data);
sett_conn_changed(settings_connection,
NM_SETTINGS_CONNECTION_UPDATE_REASON_UPDATE_NON_SECRET,
&data);
}
}

5
src/core/devices/wifi/nm-wifi-utils.c
View file

@ -1010,11 +1010,6 @@ psk_setting_to_iwd_config(GKeyFile *file, NMSettingWirelessSecurity *s_wsec, GEr
const char * key_mgmt = nm_setting_wireless_security_get_key_mgmt(s_wsec);
if (!psk || NM_FLAGS_ANY(psk_flags, SECRETS_DONT_STORE_FLAGS)) {
g_key_file_set_comment(file,
"Security",
NULL,
"The passphrase is to be queried through the agent",
NULL);
if (NM_FLAGS_ANY(psk_flags, SECRETS_DONT_STORE_FLAGS)) {
nm_log_info(
LOGD_WIFI,