<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11835">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Stefan Sperling: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_msc: remove unused parameter from msc_dtap()<br><br>The parameter link_id in the function msc_dtap() is unused. Lets remove<br>it.<br><br>Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da<br>---<br>M include/osmocom/msc/osmo_msc.h<br>M src/libmsc/a_iface_bssap.c<br>M src/libmsc/iucs.c<br>M src/libmsc/osmo_msc.c<br>M tests/msc_vlr/msc_vlr_tests.c<br>5 files changed, 5 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h</span><br><span>index 3ffb65c..a757a99 100644</span><br><span>--- a/include/osmocom/msc/osmo_msc.h</span><br><span>+++ b/include/osmocom/msc/osmo_msc.h</span><br><span>@@ -63,8 +63,7 @@</span><br><span> int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause);</span><br><span> int msc_compl_l3(struct gsm_subscriber_connection *conn,</span><br><span> struct msgb *msg, uint16_t chosen_channel);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span> int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka,</span><br><span> bool retrieve_imeisv);</span><br><span> int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv);</span><br><span>diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c</span><br><span>index c11347e..9a2333d 100644</span><br><span>--- a/src/libmsc/a_iface_bssap.c</span><br><span>+++ b/src/libmsc/a_iface_bssap.c</span><br><span>@@ -686,7 +686,7 @@</span><br><span> OMSC_LINKID_CB(msg) = dtap->link_id;</span><br><span> </span><br><span> /* Forward dtap payload into the msc */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(conn, conn->a.conn_id, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_dtap(conn, msg);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c</span><br><span>index a3092f8..95bbbee 100644</span><br><span>--- a/src/libmsc/iucs.c</span><br><span>+++ b/src/libmsc/iucs.c</span><br><span>@@ -173,7 +173,7 @@</span><br><span> uint8_t pdisc = gh->proto_discr & 0x0f;</span><br><span> OSMO_ASSERT(pdisc != GSM48_PDISC_RR);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(conn, ue_ctx->conn_id, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_dtap(conn, msg);</span><br><span> rc = 0;</span><br><span> } else {</span><br><span> /* allocate a new connection */</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index c9ecb64..f2c84e6 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -121,7 +121,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a DTAP message from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg)</span><br><span> {</span><br><span> msc_subscr_conn_get(conn, MSC_CONN_USE_DTAP);</span><br><span> gsm0408_dispatch(conn, msg);</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>index 9515c63..6cf927c 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>@@ -232,7 +232,7 @@</span><br><span> && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL))</span><br><span> msc_cipher_mode_compl(g_conn, msg, 0);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(g_conn, 23, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_dtap(g_conn, msg);</span><br><span> }</span><br><span> </span><br><span> if (!conn_exists(g_conn))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11835">change 11835</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11835"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da </div>
<div style="display:none"> Gerrit-Change-Number: 11835 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>