Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap()

dexter gerrit-no-reply at lists.osmocom.org
Fri Nov 23 10:04:29 UTC 2018


dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11835 )

Change subject: osmo_msc: remove unused parameter from msc_dtap()
......................................................................

osmo_msc: remove unused parameter from msc_dtap()

The parameter link_id in the function msc_dtap() is unused. Lets remove
it.

Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da
---
M include/osmocom/msc/osmo_msc.h
M src/libmsc/a_iface_bssap.c
M src/libmsc/iucs.c
M src/libmsc/osmo_msc.c
M tests/msc_vlr/msc_vlr_tests.c
5 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Stefan Sperling: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h
index 3ffb65c..a757a99 100644
--- a/include/osmocom/msc/osmo_msc.h
+++ b/include/osmocom/msc/osmo_msc.h
@@ -63,8 +63,7 @@
 int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause);
 int msc_compl_l3(struct gsm_subscriber_connection *conn,
 		 struct msgb *msg, uint16_t chosen_channel);
-void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id,
-	      struct msgb *msg);
+void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg);
 int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka,
 					       bool retrieve_imeisv);
 int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv);
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index c11347e..9a2333d 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -686,7 +686,7 @@
 	OMSC_LINKID_CB(msg) = dtap->link_id;
 
 	/* Forward dtap payload into the msc */
-	msc_dtap(conn, conn->a.conn_id, msg);
+	msc_dtap(conn, msg);
 
 	return 0;
 }
diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c
index a3092f8..95bbbee 100644
--- a/src/libmsc/iucs.c
+++ b/src/libmsc/iucs.c
@@ -173,7 +173,7 @@
 		uint8_t pdisc = gh->proto_discr & 0x0f;
 		OSMO_ASSERT(pdisc != GSM48_PDISC_RR);
 
-		msc_dtap(conn, ue_ctx->conn_id, msg);
+		msc_dtap(conn, msg);
 		rc = 0;
 	} else {
 		/* allocate a new connection */
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index c9ecb64..f2c84e6 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -121,7 +121,7 @@
 }
 
 /* Receive a DTAP message from BSC */
-void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg)
+void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg)
 {
 	msc_subscr_conn_get(conn, MSC_CONN_USE_DTAP);
 	gsm0408_dispatch(conn, msg);
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 9515c63..6cf927c 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -232,7 +232,7 @@
 		    && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL))
 			msc_cipher_mode_compl(g_conn, msg, 0);
 		else
-			msc_dtap(g_conn, 23, msg);
+			msc_dtap(g_conn, msg);
 	}
 
 	if (!conn_exists(g_conn))

-- 
To view, visit https://gerrit.osmocom.org/11835
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da
Gerrit-Change-Number: 11835
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Stefan Sperling <ssperling at sysmocom.de>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181123/b443eabf/attachment.html>


More information about the gerrit-log mailing list