From 7b13b5e1c02bca89a317fce57abc9b5faa115ee7 Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Sun, 19 Aug 2012 23:26:14 -0700 Subject: broadband-bearer,icera: fix CID matching for unsolicited IPDPACT responses --- src/mm-broadband-bearer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c index 8d46e318..995d8417 100644 --- a/src/mm-broadband-bearer.c +++ b/src/mm-broadband-bearer.c @@ -670,13 +670,13 @@ dial_3gpp_ready (MMBroadbandModem *modem, if (!MM_BROADBAND_BEARER_GET_CLASS (ctx->self)->dial_3gpp_finish (ctx->self, res, &error)) { + /* Clear CID when it failed to connect. */ + ctx->self->priv->cid = 0; g_simple_async_result_take_error (ctx->result, error); detailed_connect_context_complete_and_free (ctx); return; } - /* Keep CID around while connected */ - ctx->self->priv->cid = ctx->cid; if (MM_BROADBAND_BEARER_GET_CLASS (ctx->self)->get_ip_config_3gpp && MM_BROADBAND_BEARER_GET_CLASS (ctx->self)->get_ip_config_3gpp_finish) { @@ -732,6 +732,9 @@ initialize_pdp_context_ready (MMBaseModem *modem, return; } + /* Keep CID around after initializing the PDP context in order to + * handle corresponding unsolicited PDP activation responses. */ + ctx->self->priv->cid = ctx->cid; MM_BROADBAND_BEARER_GET_CLASS (ctx->self)->dial_3gpp (ctx->self, ctx->modem, ctx->primary, -- cgit v1.2.3-70-g09d2