From 9faba582263f541048816d8e161166a525952a52 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 31 Aug 2012 00:21:36 +0200 Subject: [PATCH] bearer: check only roaming allowance when launching a connection Don't abort the connection if the modem reports unregistered in either 3GPP or CDMA, as mixed CDMA+3GPP modems may connect even if not registered in both technologies. --- src/mm-bearer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mm-bearer.c b/src/mm-bearer.c index 65c391b4..d9a7e62d 100644 --- a/src/mm-bearer.c +++ b/src/mm-bearer.c @@ -434,9 +434,9 @@ mm_bearer_connect (MMBearer *self, return; } - /* Check 3GPP roaming allowance */ + /* Check 3GPP roaming allowance, *only* roaming related here */ if (mm_iface_modem_is_3gpp (MM_IFACE_MODEM (self->priv->modem)) && - self->priv->reason_3gpp != CONNECTION_FORBIDDEN_REASON_NONE) { + self->priv->reason_3gpp == CONNECTION_FORBIDDEN_REASON_ROAMING) { g_simple_async_report_error_in_idle ( G_OBJECT (self), callback, @@ -448,9 +448,9 @@ mm_bearer_connect (MMBearer *self, return; } - /* Check CDMA roaming allowance */ + /* Check CDMA roaming allowance, *only* roaming related here */ if (mm_iface_modem_is_cdma (MM_IFACE_MODEM (self->priv->modem)) && - self->priv->reason_cdma != CONNECTION_FORBIDDEN_REASON_NONE) { + self->priv->reason_cdma == CONNECTION_FORBIDDEN_REASON_ROAMING) { g_simple_async_report_error_in_idle ( G_OBJECT (self), callback,