colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bearer-qmi: try to use proper QMI port to connect a given net interface

Browse Source
This commit is contained in:
Aleksander Morgado
2012-08-30 11:01:55 +02:00
parent 36733aa4de
commit 5e448cf5d3
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mm-bearer-qmi.c
View File

@@ -596,14 +596,6 @@ connect_context_step (ConnectContext *ctx)
} }
} }
static MMQmiPort *
get_qmi_port_for_data_port (MMBaseModem *modem,
MMPort *data)
{
/* TODO: match QMI and WWAN ports */
return mm_base_modem_get_port_qmi (modem);
}
static void static void
connect (MMBearer *self, connect (MMBearer *self,
GCancellable *cancellable, GCancellable *cancellable,
@@ -615,6 +607,7 @@ connect (MMBearer *self,
MMBaseModem *modem = NULL; MMBaseModem *modem = NULL;
MMPort *data; MMPort *data;
MMQmiPort *qmi; MMQmiPort *qmi;
GError *error = NULL;
g_object_get (self, g_object_get (self,
MM_BEARER_MODEM, &modem, MM_BEARER_MODEM, &modem,
@@ -636,17 +629,13 @@ connect (MMBearer *self,
} }
/* Each data port has a single QMI port associated */ /* Each data port has a single QMI port associated */
qmi = get_qmi_port_for_data_port (modem, data); qmi = mm_base_modem_get_port_qmi_for_data (modem, data, &error);
if (!qmi) { if (!qmi) {
g_simple_async_report_error_in_idle ( g_simple_async_report_take_gerror_in_idle (
G_OBJECT (self), G_OBJECT (self),
callback, callback,
user_data, user_data,
MM_CORE_ERROR, error);
MM_CORE_ERROR_NOT_FOUND,
"No QMI port found associated to data port (%s/%s)",
mm_port_subsys_get_string (mm_port_get_subsys (data)),
mm_port_get_device (data));
g_object_unref (data); g_object_unref (data);
g_object_unref (modem); g_object_unref (modem);
return; return;