Attachment 118427 Details for Bug 91189 – Increase the retry interval to 5 seconds.

[patch] Increase the retry interval to 5 seconds.

0001-libmbim-glib-Increase-the-retry-interval-to-5-second.patch (text/plain), 2.07 KB, created by Shih-Yuan Lee on 2015-09-24 09:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shih-Yuan Lee

Created: 2015-09-24 09:56:03 UTC

Size: 2.07 KB

patch

obsolete

>From 690956883f7fc038c8d3e5db63c29d1d96fbd485 Mon Sep 17 00:00:00 2001
>From: "Shih-Yuan Lee (FourDollars)" <sylee@canonical.com>
>Date: Thu, 24 Sep 2015 16:32:41 +0800
>Subject: [PATCH] libmbim-glib: Increase the retry interval to 5 seconds.
>
>Sierra Mobile Broadband EM7455 won't work while the retry interval is
>only one second.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=91189
>
>Signed-off-by: Shih-Yuan Lee (FourDollars) <sylee@canonical.com>
>---
> src/libmbim-glib/mbim-device.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c
>index d434665..c0bb5da 100644
>--- a/src/libmbim-glib/mbim-device.c
>+++ b/src/libmbim-glib/mbim-device.c
>@@ -33,6 +33,7 @@
> #include <gudev/gudev.h>
> #include <sys/ioctl.h>
> #define IOCTL_WDM_MAX_COMMAND _IOR('H', 0xA0, guint16)
>+#define RETRY_TIMEOUT_SECS 5
> 
> #include "mbim-utils.h"
> #include "mbim-device.h"
>@@ -1117,7 +1118,7 @@ typedef struct {
>     GCancellable *cancellable;
>     DeviceOpenContextStep step;
>     MbimDeviceOpenFlags flags;
>-    guint timeout;
>+    gint timeout;
> } DeviceOpenContext;
> 
> static void
>@@ -1190,8 +1191,8 @@ open_message_ready (MbimDevice        *self,
>         /* Check if we should be retrying */
>         if (g_error_matches (error, MBIM_CORE_ERROR, MBIM_CORE_ERROR_TIMEOUT)) {
>             /* The timeout will tell us how many retries we should do */
>-            ctx->timeout--;
>-            if (ctx->timeout) {
>+            ctx->timeout -= RETRY_TIMEOUT_SECS;
>+            if (ctx->timeout > 0) {
>                 g_error_free (error);
>                 open_message (ctx);
>                 return;
>@@ -1231,7 +1232,7 @@ open_message (DeviceOpenContext *ctx)
>                                      ctx->self->priv->max_control_transfer);
>     mbim_device_command (ctx->self,
>                          request,
>-                         1, /* 1s per retry */
>+                         RETRY_TIMEOUT_SECS,
>                          ctx->cancellable,
>                          (GAsyncReadyCallback)open_message_ready,
>                          ctx);
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 91189: 116875 | 116876 | 116969 | 116971 | 118426 | 118427

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.