sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gprs: Remove prior attaching state logic 

Commit 1fd419e5b4 and
0167c3339c introduced logic that
treated ofono_gprs_cid_activated as an 'attaching' state.

Since gprs_attached_update now guarantees that we
will not get attached without having a context activated
in LTE, this is not needed anymore. It also potentially
interferes in case the driver was actually attaching.
This commit is contained in:
Richard Röjfors 2019-08-20 17:56:51 +02:00 committed by Denis Kenzior
parent b50ff27d3f
commit 06de0c3067
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gprs.c
View File

@ -913,7 +913,6 @@ static void pri_read_settings_callback(const struct ofono_error *error,
{
struct pri_context *pri_ctx = data;
struct ofono_gprs_context *gc = pri_ctx->context_driver;
struct ofono_gprs *gprs = pri_ctx->gprs;
DBusConnection *conn = ofono_dbus_get_connection();
dbus_bool_t value;
@ -938,19 +937,11 @@ static void pri_read_settings_callback(const struct ofono_error *error,
value = pri_ctx->active;
gprs->flags &= ~GPRS_FLAG_ATTACHING;
gprs->driver_attached = TRUE;
gprs_set_attached_property(gprs, TRUE);
gprs_set_attached_property(pri_ctx->gprs, TRUE);
ofono_dbus_signal_property_changed(conn, pri_ctx->path,
OFONO_CONNECTION_CONTEXT_INTERFACE,
"Active", DBUS_TYPE_BOOLEAN, &value);
if (gprs->flags & GPRS_FLAG_RECHECK) {
gprs->flags &= ~GPRS_FLAG_RECHECK;
gprs_netreg_update(gprs);
}
}
static DBusMessage *pri_set_apn(struct pri_context *ctx, DBusConnection *conn,
@ -2039,14 +2030,6 @@ void ofono_gprs_cid_activated(struct ofono_gprs *gprs, unsigned int cid,
DBUS_TYPE_STRING, &apn);
}
/* Prevent ofono_gprs_status_notify from changing the 'attached'
* state until after the context has been set to 'active' in
* the pri_read_settings_callback; this prevents a race where
* the connection manager sees the modem as attached before there
* is an active context.
*/
gprs->flags |= GPRS_FLAG_ATTACHING;
gc->driver->read_settings(gc, cid, pri_read_settings_callback, pri_ctx);
}