diff options
| author | Prathmesh Prabhu <pprabhu@chromium.org> | 2013-09-03 23:54:07 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-09-04 09:05:19 +0200 |
| commit | 57c657bd066366db6892ac2a8adfec2ca209ccbe (patch) | |
| tree | 04f1e5210d6e5e5f592a358381c09a2a95d47e17 | |
| parent | c014bce554cc4710c25bae40ff1f88e1d4577c4a (diff) | |
huawei: retry connect/disconnect attempt upon ^NDISSTATQRY? failures
The Huawei MU736 modem sometimes responds to the ^NDISSTATQRY? query with a
'+CME ERROR: 100' error. This patch works around the issue by ignoring a few
of these error responses in a connect / disconnect attempt. The overall timeout
for the connect/disconnect operation is not affected by this change.
| -rw-r--r-- | plugins/huawei/mm-broadband-bearer-huawei.c | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c index 2e1b0b06..38892d94 100644 --- a/plugins/huawei/mm-broadband-bearer-huawei.c +++ b/plugins/huawei/mm-broadband-bearer-huawei.c @@ -57,6 +57,7 @@ typedef struct { GSimpleAsyncResult *result; Connect3gppContextStep step; guint check_count; + guint failed_ndisstatqry_count; } Connect3gppContext; static void @@ -130,16 +131,10 @@ connect_ndisstatqry_check_ready (MMBaseModem *modem, &ipv6_available, &ipv6_connected, &error)) { - mm_dbg ("Modem doesn't properly support ^NDISSTATQRY command: %s", error->message); + ctx->failed_ndisstatqry_count++; + mm_dbg ("Unexpected response to ^NDISSTATQRY command: %s (Attempts so far: %u)", + error->message, ctx->failed_ndisstatqry_count); g_error_free (error); - - ctx->self->priv->connect_pending = NULL; - g_simple_async_result_set_error (ctx->result, - MM_MOBILE_EQUIPMENT_ERROR, - MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED, - "Connection attempt not supported"); - connect_3gpp_context_complete_and_free (ctx); - return; } /* Connected in IPv4? */ @@ -316,6 +311,18 @@ connect_3gpp_context_step (Connect3gppContext *ctx) return; } + /* Give up if too many unexpected responses to NIDSSTATQRY are encountered. */ + if (ctx->failed_ndisstatqry_count > 10) { + /* Clear context */ + ctx->self->priv->connect_pending = NULL; + g_simple_async_result_set_error (ctx->result, + MM_MOBILE_EQUIPMENT_ERROR, + MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED, + "Connection attempt not supported."); + connect_3gpp_context_complete_and_free (ctx); + return; + } + /* Check if connected */ ctx->check_count++; mm_base_modem_at_command_full (ctx->modem, @@ -413,6 +420,7 @@ typedef struct { GSimpleAsyncResult *result; Disconnect3gppContextStep step; guint check_count; + guint failed_ndisstatqry_count; } Disconnect3gppContext; static void @@ -480,16 +488,10 @@ disconnect_ndisstatqry_check_ready (MMBaseModem *modem, &ipv6_available, &ipv6_connected, &error)) { - mm_dbg ("Modem doesn't properly support ^NDISSTATQRY command: %s", error->message); + ctx->failed_ndisstatqry_count++; + mm_dbg ("Unexpected response to ^NDISSTATQRY command: %s (Attempts so far: %u)", + error->message, ctx->failed_ndisstatqry_count); g_error_free (error); - - ctx->self->priv->disconnect_pending = NULL; - g_simple_async_result_set_error (ctx->result, - MM_MOBILE_EQUIPMENT_ERROR, - MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED, - "Disconnection attempt not supported"); - disconnect_3gpp_context_complete_and_free (ctx); - return; } /* Disconnected IPv4? */ @@ -569,6 +571,18 @@ disconnect_3gpp_context_step (Disconnect3gppContext *ctx) return; } + /* Give up if too many unexpected responses to NIDSSTATQRY are encountered. */ + if (ctx->failed_ndisstatqry_count > 10) { + /* Clear context */ + ctx->self->priv->disconnect_pending = NULL; + g_simple_async_result_set_error (ctx->result, + MM_MOBILE_EQUIPMENT_ERROR, + MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED, + "Disconnection attempt not supported."); + disconnect_3gpp_context_complete_and_free (ctx); + return; + } + /* Check if disconnected */ ctx->check_count++; mm_base_modem_at_command_full (ctx->modem, |