diff options
| author | Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2020-03-26 10:06:45 +0100 |
|---|---|---|
| committer | Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2020-03-27 11:01:41 +0100 |
| commit | 0cf7f1d2f580d761ebf3915a04056d150621d067 (patch) | |
| tree | b35989565af1adb8cdab6a4f5b080a9ccef388ca | |
| parent | df20a98aa4fb374c6debe23a6fc8c3badffa523f (diff) | |
nm-modem: don't fail if secrets request times out
When starting with a locked modem, it may take some time for the user to
enter the PIN code, leading to the secrets request timing out. In that
case, we want the connection activation to be retried automatically once
the modem is unlocked, which can't be achieved if we propagate the error,
as the device will change state to 'failed'.
This patch ignores the 'no-secrets' error, as it means either the
request has timed out, or the user cancelled the request without
notifying NetworkManager. By doing this, we allow the connection to be
re-activated once the modem is unlocked.
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 88239b63de..bedc38448a 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -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) |