2 files changed, 5 insertions, 5 deletions
diff --git a/gprs.c b/gprs.c
index 26e0ea8..dcf688e 100644
--- a/gprs.c
+++ b/gprs.c
@@ -102,12 +102,12 @@ void ril_request_setup_data_call(RIL_Token t, void *data, int length)
 	/* create the structs with the username/password tuple */
 	ipc_gprs_pdp_context_setup(&(ril_state.gprs_context), 1, username, password);
 
+	ipc_gen_phone_res_expect_to_func(reqGetId(t), IPC_GPRS_DEFINE_PDP_CONTEXT,
+		ipc_gprs_pdp_context_complete);
+
 	/* send the struct to the modem */
 	ipc_fmt_send(IPC_GPRS_DEFINE_PDP_CONTEXT, IPC_TYPE_SET, 
 			(void *) &setup_apn_message, sizeof(struct ipc_gprs_define_pdp_context), reqGetId(t));
-
-	ipc_gen_phone_res_expect_to_func(reqGetId(t), IPC_GPRS_DEFINE_PDP_CONTEXT,
-		ipc_gprs_pdp_context_complete);
 }
 
 void ipc_gprs_ip_configuration(struct ipc_message_info *info)
diff --git a/net.c b/net.c
index 1b15252..eb217c2 100644
--- a/net.c
+++ b/net.c
@@ -447,7 +447,7 @@ void ril_request_registration_state(RIL_Token t)
 		/* Request data to the modem */
 		ril_state.tokens.registration_state = t;
 
-		ipc_net_regist_get(&regist_req, IPC_NET_SERVICE_DOMAIN_GSM);
+		ipc_net_regist_setup(&regist_req, IPC_NET_SERVICE_DOMAIN_GSM);
 		ipc_fmt_send(IPC_NET_REGIST, IPC_TYPE_GET, (void *)&regist_req, sizeof(struct ipc_net_regist_get), reqGetId(t));
 	} else {
 		LOGE("Another request is going on, returning UNSOL data");
@@ -500,7 +500,7 @@ void ril_request_gprs_registration_state(RIL_Token t)
 		/* Request data to the modem */
 		ril_state.tokens.gprs_registration_state = t;
 
-		ipc_net_regist_get(&regist_req, IPC_NET_SERVICE_DOMAIN_GPRS);
+		ipc_net_regist_setup(&regist_req, IPC_NET_SERVICE_DOMAIN_GPRS);
 		ipc_fmt_send(IPC_NET_REGIST, IPC_TYPE_GET, (void *)&regist_req, sizeof(struct ipc_net_regist_get), reqGetId(t));
 	} else {
 		LOGE("Another request is going on, returning UNSOL data");