From 54729d6e5e4d6dc2d03bc400fcc4d358ea2ff395 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Mon, 19 Nov 2018 18:31:16 +0100 Subject: [PATCH] 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 --- include/osmocom/msc/osmo_msc.h | 3 +-- src/libmsc/a_iface_bssap.c | 2 +- src/libmsc/iucs.c | 2 +- src/libmsc/osmo_msc.c | 2 +- tests/msc_vlr/msc_vlr_tests.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 3ffb65c91..a757a9940 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -63,8 +63,7 @@ void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci); 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 c11347eb2..9a2333db5 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -686,7 +686,7 @@ static int rx_dtap(const struct osmo_sccp_user *scu, const struct a_conn_info *a 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 a3092f86e..95bbbeeae 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -173,7 +173,7 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, 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 c9ecb64ab..f2c84e629 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -121,7 +121,7 @@ int msc_compl_l3(struct gsm_subscriber_connection *conn, } /* 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 9515c63eb..6cf927c2f 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -232,7 +232,7 @@ void rx_from_ms(struct msgb *msg) && (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))