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

broadband-modem-mbim: avoid LTE attach config/status if unsupported

Browse Source 
If we know that the LTE attach status/configuration CIDs in the Basic
Connect Extensions service are unsupported, don't even try to use
them, so that we avoid timeouts in the requests.
This commit is contained in:
Aleksander Morgado
2019-11-27 08:56:14 +01:00
parent c523d5bdc3
commit 8f21f40674
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/mm-broadband-modem-mbim.c
View File

@@ -2449,19 +2449,27 @@ lte_attach_status_query_ready (MbimDevice *device,
} }
static void static void
modem_3gpp_load_initial_eps_bearer (MMIfaceModem3gpp *self, modem_3gpp_load_initial_eps_bearer (MMIfaceModem3gpp *_self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MbimDevice *device; MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self);
MbimMessage *message; MbimDevice *device;
GTask *task; MbimMessage *message;
GTask *task;
if (!peek_device (self, &device, callback, user_data)) if (!peek_device (self, &device, callback, user_data))
return; return;
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
if (!self->priv->is_lte_attach_status_supported) {
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"LTE attach status is unsupported");
g_object_unref (task);
return;
}
message = mbim_message_ms_basic_connect_extensions_lte_attach_status_query_new (NULL); message = mbim_message_ms_basic_connect_extensions_lte_attach_status_query_new (NULL);
mbim_device_command (device, mbim_device_command (device,
message, message,
@@ -2569,19 +2577,27 @@ lte_attach_configuration_query_ready (MbimDevice *device,
} }
static void static void
modem_3gpp_load_initial_eps_bearer_settings (MMIfaceModem3gpp *self, modem_3gpp_load_initial_eps_bearer_settings (MMIfaceModem3gpp *_self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MbimDevice *device; MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self);
MbimMessage *message; MbimDevice *device;
GTask *task; MbimMessage *message;
GTask *task;
if (!peek_device (self, &device, callback, user_data)) if (!peek_device (self, &device, callback, user_data))
return; return;
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
if (!self->priv->is_lte_attach_status_supported) {
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"LTE attach configuration is unsupported");
g_object_unref (task);
return;
}
message = mbim_message_ms_basic_connect_extensions_lte_attach_configuration_query_new (NULL); message = mbim_message_ms_basic_connect_extensions_lte_attach_configuration_query_new (NULL);
mbim_device_command (device, mbim_device_command (device,
message, message,
@@ -2731,19 +2747,28 @@ before_set_lte_attach_configuration_query_ready (MbimDevice *device,
} }
static void static void
modem_3gpp_set_initial_eps_bearer_settings (MMIfaceModem3gpp *self, modem_3gpp_set_initial_eps_bearer_settings (MMIfaceModem3gpp *_self,
MMBearerProperties *config, MMBearerProperties *config,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GTask *task; MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self);
MbimDevice *device; GTask *task;
MbimMessage *message; MbimDevice *device;
MbimMessage *message;
if (!peek_device (self, &device, callback, user_data)) if (!peek_device (self, &device, callback, user_data))
return; return;
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
if (!self->priv->is_lte_attach_status_supported) {
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"LTE attach configuration is unsupported");
g_object_unref (task);
return;
}
g_task_set_task_data (task, g_object_ref (config), g_object_unref); g_task_set_task_data (task, g_object_ref (config), g_object_unref);
message = mbim_message_ms_basic_connect_extensions_lte_attach_configuration_query_new (NULL); message = mbim_message_ms_basic_connect_extensions_lte_attach_configuration_query_new (NULL);