diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h
index 4513c4d..1e5ffce 100644
--- a/openbsc/include/openbsc/gsm_04_08.h
+++ b/openbsc/include/openbsc/gsm_04_08.h
@@ -30,7 +30,7 @@
 enum gsm_chan_t get_ctype_by_chreq(struct gsm_bts *bts, u_int8_t ra, int neci);
 enum gsm_chreq_reason_t get_reason_by_chreq(struct gsm_bts *bts, u_int8_t ra, int neci);
 
-int gsm48_tx_mm_info(struct gsm_lchan *lchan);
+int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn);
 int gsm48_tx_mm_auth_req(struct gsm_lchan *lchan, u_int8_t *rand, int key_seq);
 int gsm48_tx_mm_auth_rej(struct gsm_lchan *lchan);
 int gsm48_send_rr_release(struct gsm_lchan *lchan);
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index 14fdfc1..e3eafe6 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -255,7 +255,7 @@
 			rc = gsm0408_loc_upd_acc(conn, conn->subscr->tmsi);
 			if (lchan->ts->trx->bts->network->send_mm_info) {
 				/* send MM INFO with network name */
-				rc = gsm48_tx_mm_info(lchan);
+				rc = gsm48_tx_mm_info(conn);
 			}
 
 			/* call subscr_update after putting the loc_upd_acc
@@ -568,11 +568,11 @@
 #endif
 
 /* Section 9.2.15a */
-int gsm48_tx_mm_info(struct gsm_lchan *lchan)
+int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
 {
 	struct msgb *msg = gsm48_msgb_alloc();
 	struct gsm48_hdr *gh;
-	struct gsm_network *net = lchan->ts->trx->bts->network;
+	struct gsm_network *net = conn->bts->network;
 	u_int8_t *ptr8;
 	int name_len, name_pad;
 #if 0
@@ -581,7 +581,7 @@
 	int tz15min;
 #endif
 
-	msg->lchan = lchan;
+	msg->lchan = conn->lchan;
 
 	gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
 	gh->proto_discr = GSM48_PDISC_MM;
@@ -667,7 +667,7 @@
 
 	DEBUGP(DMM, "-> MM INFO\n");
 
-	return gsm48_conn_sendmsg(msg, &lchan->conn, NULL);
+	return gsm48_conn_sendmsg(msg, conn, NULL);
 }
 
 /* Section 9.2.2 */