diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2015-10-14 19:24:37 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2015-10-15 09:15:36 +0200 |
| commit | 0579ac076a073f2847c5171c5e72c0db5e3a8e51 (patch) | |
| tree | 193375cc0af77dec97c257fb5a00ac491736f904 /src/mm-iface-modem-cdma.c | |
| parent | 1cb68c810e9e3f3589bdd121f0c383da1556cdeb (diff) | |
mm-broadband-modem: trigger registration checks only after enabling all ifaces
Given that the Location interface requires 3GPP info reported by the 3GPP
interface, we should only trigger registration checks once the Location
interface has been already enabled and ready to be used. If we don't do this,
we'll end up e.g. getting initial MCCMNC values but never reaching the Location
interface properly.
So, fix this by triggering all registration checks (CDMA and 3GPP) only after
having enabled all interfaces.
Diffstat (limited to 'src/mm-iface-modem-cdma.c')
| -rw-r--r-- | src/mm-iface-modem-cdma.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 853f1dbc..67d360a1 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -1414,7 +1414,6 @@ typedef enum { ENABLING_STEP_FIRST, ENABLING_STEP_SETUP_UNSOLICITED_EVENTS, ENABLING_STEP_ENABLE_UNSOLICITED_EVENTS, - ENABLING_STEP_RUN_REGISTRATION_CHECKS, ENABLING_STEP_PERIODIC_REGISTRATION_CHECKS, ENABLING_STEP_LAST } EnablingStep; @@ -1500,24 +1499,6 @@ enable_unsolicited_events_ready (MMIfaceModemCdma *self, } static void -run_registration_checks_ready (MMIfaceModemCdma *self, - GAsyncResult *res, - EnablingContext *ctx) -{ - GError *error = NULL; - - if (!mm_iface_modem_cdma_run_registration_checks_finish (self, res, &error)) { - g_simple_async_result_take_error (ctx->result, error); - enabling_context_complete_and_free (ctx); - return; - } - - /* Go on to next step */ - ctx->step++; - interface_enabling_step (ctx); -} - -static void interface_enabling_step (EnablingContext *ctx) { /* Don't run new steps if we're cancelled */ @@ -1553,12 +1534,6 @@ interface_enabling_step (EnablingContext *ctx) /* Fall down to next step */ ctx->step++; - case ENABLING_STEP_RUN_REGISTRATION_CHECKS: - mm_iface_modem_cdma_run_registration_checks (ctx->self, - (GAsyncReadyCallback)run_registration_checks_ready, - ctx); - return; - case ENABLING_STEP_PERIODIC_REGISTRATION_CHECKS: periodic_registration_check_enable (ctx->self); /* Fall down to next step */ |