Tx Loc UPD ACC: Use PLMN provided by subscr

Change-Id: I421bd63a264db2bf6e1c4a4eea976f389e87b332
---
M src/libmsc/gsm_04_08.c
1 file changed, 10 insertions(+), 6 deletions(-)


git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/33732/1

diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index bd7cfe0..287cffc 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -119,12 +119,7 @@
 	struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD ACC");
 	struct gsm48_hdr *gh;
 	struct gsm48_loc_area_id *lai;
-	struct gsm_network *net = msc_a_net(msc_a);
 	struct vlr_subscr *vsub = msc_a_vsub(msc_a);
-	struct osmo_location_area_id laid = {
-		.plmn = net->plmn,
-		.lac = vsub->cgi.lai.lac,
-	};
 	uint8_t *l;
 	int rc;
 	struct osmo_mobile_identity mi = {};
@@ -134,7 +129,7 @@
 	gh->msg_type = GSM48_MT_MM_LOC_UPD_ACCEPT;
 
 	lai = (struct gsm48_loc_area_id *) msgb_put(msg, sizeof(*lai));
-	gsm48_generate_lai2(lai, &laid);
+	gsm48_generate_lai2(lai, &vsub->cgi.lai);
 
 	if (send_tmsi == GSM_RESERVED_TMSI) {
 		/* we did not allocate a TMSI to the MS, so we need to

