Change in osmo-sgsn[master]: gmm: fix build without define PTMSI_ALLOC

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Dec 1 11:47:58 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21379 )

Change subject: gmm: fix build without define PTMSI_ALLOC
......................................................................

gmm: fix build without define PTMSI_ALLOC

Change-Id: Idcac01c4634af81ef884dc2b1b20dec3f8d12236
---
M src/sgsn/gprs_gmm.c
1 file changed, 7 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 3f7c8ab..f425da2 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -281,9 +281,11 @@
 	struct gsm48_hdr *gh;
 	struct gsm48_attach_ack *aa;
 	unsigned long t;
+#ifdef PTMSI_ALLOC
 	struct osmo_mobile_identity mi;
 	uint8_t *l;
 	int rc;
+#endif
 #if 0
 	uint8_t *ptsig;
 #endif
@@ -922,9 +924,9 @@
 		ctx->t3350_mode = GMM_T3350_MODE_ATT;
 #else
 		memset(&sig_data, 0, sizeof(sig_data));
-		sig_data.mm = mmctx;
+		sig_data.mm = ctx;
 		osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data);
-		osmo_fsm_inst_dispatch(mm->gmm_fsm, E_GMM_ATTACH_SUCCESS, NULL);
+		osmo_fsm_inst_dispatch(ctx->gmm_fsm, E_GMM_ATTACH_SUCCESS, NULL);
 #endif
 
 		return gsm48_tx_gmm_att_ack(ctx);
@@ -1438,9 +1440,11 @@
 	struct gsm48_hdr *gh;
 	struct gsm48_ra_upd_ack *rua;
 	unsigned long t;
+#ifdef PTMSI_ALLOC
 	uint8_t *l;
 	int rc;
 	struct osmo_mobile_identity mi;
+#endif
 
 	rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_ACKED]);
 	LOGMMCTXP(LOGL_INFO, mm, "<- ROUTING AREA UPDATE ACCEPT\n");
@@ -1727,7 +1731,7 @@
 	mmctx_timer_start(mmctx, 3350);
 #else
 	/* Make sure we are NORMAL (i.e. not SUSPENDED anymore) */
-	osmo_fsm_inst_dispatch(mm->gmm_fsm, E_GMM_ATTACH_SUCCESS, NULL);
+	osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_ATTACH_SUCCESS, NULL);
 
 	memset(&sig_data, 0, sizeof(sig_data));
 	sig_data.mm = mmctx;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21379
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Idcac01c4634af81ef884dc2b1b20dec3f8d12236
Gerrit-Change-Number: 21379
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201201/012fa731/attachment.htm>


More information about the gerrit-log mailing list