diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-05-18 21:56:33 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-05-23 01:22:07 +0200 |
| commit | 6a56c5678c863a689468ae074527a3f411fee9ae (patch) | |
| tree | b955463c018a8b39d1096ab92db79138792d3bb1 | |
| parent | e233d033fc09e2a84f0fb47eb64d0fda6de4151e (diff) | |
bearer-mbim: network error 0 is actually a valid error (unknown)
| -rw-r--r-- | src/mm-bearer-mbim.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c index 89f66f31..2e0e476e 100644 --- a/src/mm-bearer-mbim.c +++ b/src/mm-bearer-mbim.c @@ -628,20 +628,14 @@ connect_set_ready (MbimDevice *device, mbim_activation_state_get_string (activation_state), mbim_context_ip_type_get_string (ctx->requested_ip_type), mbim_context_ip_type_get_string (ctx->activated_ip_type), - nw_error ? mbim_nw_error_get_string (nw_error) : "none"); + mbim_nw_error_get_string (nw_error)); /* If the response reports an ACTIVATED state, we're good even if * there is a nw_error set (e.g. asking for IPv4v6 may return a * 'pdp-type-ipv4-only-allowed' nw_error). */ if (activation_state != MBIM_ACTIVATION_STATE_ACTIVATED && activation_state != MBIM_ACTIVATION_STATE_ACTIVATING) { - if (nw_error) { - g_clear_error (&error); - error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self); - } else if (!error) { - error = g_error_new (MM_MOBILE_EQUIPMENT_ERROR, - MM_MOBILE_EQUIPMENT_ERROR_GPRS_UNKNOWN, - "Unknown error: context activation failed"); - } + g_clear_error (&error); + error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self); } } else { /* Prefer the error from the result to the parsing error */ |