gprs: Unify logic inside registration_status_cb

And delay reseting the ATTACHING flag until we had a chance to query the
CGREG status.

1 files changed, 12 insertions, 11 deletions

diff --git a/src/gprs.c b/src/gprs.c
index 559a43d3..acbfa563 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -1489,8 +1489,12 @@ static void registration_status_cb(const struct ofono_error *error,
 	DBG("%s error %d status %d", __ofono_atom_get_path(gprs->atom),
 		error->type, status);
 
+	gprs->flags &= ~GPRS_FLAG_ATTACHING;
+
 	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
 		ofono_gprs_status_notify(gprs, status);
+	else
+		gprs_attached_update(gprs);
 
 	if (gprs->flags & GPRS_FLAG_RECHECK) {
 		gprs->flags &= ~GPRS_FLAG_RECHECK;
@@ -1504,23 +1508,20 @@ static void gprs_attach_callback(const struct ofono_error *error, void *data)
 
 	DBG("%s error = %d", __ofono_atom_get_path(gprs->atom), error->type);
 
-	gprs->flags &= ~GPRS_FLAG_ATTACHING;
-
 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
 		gprs->driver_attached = !gprs->driver_attached;
 
-	if (gprs->driver->attached_status) {
-		gprs->driver->attached_status(gprs, registration_status_cb,
-						gprs);
-		return;
-	}
+	if (gprs->driver->attached_status == NULL) {
+		struct ofono_error error;
 
-	gprs_attached_update(gprs);
+		error.type = OFONO_ERROR_TYPE_FAILURE;
+		error.error = 0;
 
-	if (gprs->flags & GPRS_FLAG_RECHECK) {
-		gprs->flags &= ~GPRS_FLAG_RECHECK;
-		gprs_netreg_update(gprs);
+		registration_status_cb(&error, -1, gprs);
+		return;
 	}
+
+	gprs->driver->attached_status(gprs, registration_status_cb, gprs);
 }
 
 static void gprs_netreg_removed(struct ofono_gprs *gprs)