commit 876e6dfdf4c84961a00e3f909d995a9716b899fe
author Ben Chan <benchan@chromium.org> Tue Oct 07 23:13:36 2014
committer Ben Chan <benchan@chromium.org> Wed Oct 08 02:27:11 2014
tree 7c9262b9c7d5691c882a5cbb0c4400c89e7fac70
parent 417fa073c480584512812a597fc30fc749fc9c67

Revert "port-mbim: use the mbim-proxy by default"

This reverts commit a22681ba99f8249a5d516dca773b125c0bdf0912.

Temporarily disable mbim-proxy until we can run ModemManager and
mbim-proxy under a non-root user.

BUG=chromium:421293
TEST=`FEATURES=test emerge-$BOARD modemmanager-next`
TEST=Run network3g tests on a DUT with a MBIM modem.

Change-Id: I253572bf3c1a0c0d57fb66338c8e37399cd6c974

src/mm-port-mbim.c

diff --git a/src/mm-port-mbim.c b/src/mm-port-mbim.c
index 2b64996..4b85ac3 100644
--- a/src/mm-port-mbim.c
+++ b/src/mm-port-mbim.c
@@ -85,7 +85,8 @@
 
     /* Reset the progress flag */
     ctx->self->priv->in_progress = FALSE;
-    if (!mbim_device_open_full_finish (mbim_device, res, &error)) {
+
+    if (!mbim_device_open_finish (mbim_device, res, &error)) {
         g_clear_object (&ctx->self->priv->mbim_device);
         g_simple_async_result_take_error (ctx->result, error);
     } else
@@ -109,12 +110,11 @@
     }
 
     /* Now open the MBIM device */
-    mbim_device_open_full (ctx->self->priv->mbim_device,
-                           MBIM_DEVICE_OPEN_FLAGS_PROXY,
-                           30,
-                           ctx->cancellable,
-                           (GAsyncReadyCallback)mbim_device_open_ready,
-                           ctx);
+    mbim_device_open (ctx->self->priv->mbim_device,
+                      30,
+                      ctx->cancellable,
+                      (GAsyncReadyCallback)mbim_device_open_ready,
+                      ctx);
 }
 
 void