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

wwan: merge branch 'a-wai/NetworkManager-fix-sim-unlock'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/452

Fixes https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/397

Reviewed-by: Antonio Cardace <acardace@redhat.com>
This commit is contained in:
Antonio Cardace 2020-03-27 11:44:27 +01:00
commit 54aaf240d2
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/devices/wwan/nm-device-modem.c
View file

@ -384,6 +384,15 @@ modem_state_cb (NMModem *modem,
*/
nm_modem_set_mm_enabled (priv->modem, priv->rf_enabled);
if (dev_state == NM_DEVICE_STATE_NEED_AUTH) {
/* The modem was unlocked externally to NetworkManager,
deactivate so the default connection can be
automatically activated again */
nm_device_state_changed (device,
NM_DEVICE_STATE_DEACTIVATING,
NM_DEVICE_STATE_REASON_MODEM_AVAILABLE);
}
/* Now allow connections without a PIN to be available */
nm_device_recheck_available_connections (device);
}

3
src/devices/wwan/nm-modem.c
View file

@ -975,7 +975,8 @@ modem_secrets_cb (NMActRequest *req,
priv->secrets_id = NULL;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
g_error_matches (error, NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_NO_SECRETS))
return;
if (error)