<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9503">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop dead code: conn->T10, handled by gscon instead<br><br>Change-Id: Ief20cb0f46dd93f46dd765dca307724dc2b3487c<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_api.c<br>2 files changed, 0 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/9503/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 281f2d4..8f245c9 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -112,8 +112,6 @@</span><br><span>      /* handover information, if a handover is pending for this conn. */</span><br><span>  struct bsc_handover *ho;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* timer for assignment handling */</span><br><span style="color: hsl(0, 100%, 40%);">-     struct osmo_timer_list T10;</span><br><span>  /* the future allocated but not yet used lchan during ASSIGNMENT */</span><br><span>  struct gsm_lchan *secondary_lchan;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_api.c b/src/osmo-bsc/bsc_api.c</span><br><span>index e0a23eb..bb86986 100644</span><br><span>--- a/src/osmo-bsc/bsc_api.c</span><br><span>+++ b/src/osmo-bsc/bsc_api.c</span><br><span>@@ -327,9 +327,6 @@</span><br><span>            return;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* swap channels */</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo_timer_del(&conn->T10);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   lchan_release(conn->lchan, 0, RSL_REL_LOCAL_END);</span><br><span>         conn->lchan = conn->secondary_lchan;</span><br><span>   conn->secondary_lchan = NULL;</span><br><span>@@ -374,7 +371,6 @@</span><br><span>       }</span><br><span> </span><br><span>        /* stop the timer and release it */</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo_timer_del(&conn->T10);</span><br><span>   if (conn->secondary_lchan) {</span><br><span>              lchan_release(conn->secondary_lchan, 0, RSL_REL_LOCAL_END);</span><br><span>               conn->secondary_lchan = NULL;</span><br><span>@@ -533,7 +529,6 @@</span><br><span>                       handle_ass_fail(conn, msg);</span><br><span>                  break;</span><br><span>               case GSM48_MT_RR_CHAN_MODE_MODIF_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">-                   osmo_timer_del(&conn->T10);</span><br><span>                   rc = gsm48_rx_rr_modif_ack(msg);</span><br><span>                     if (rc < 0)</span><br><span>                               bsc_assign_fail(conn, GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, NULL);</span><br><span>@@ -646,8 +641,6 @@</span><br><span>        conn->lchan = NULL;</span><br><span>       conn->secondary_lchan = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_timer_del(&conn->T10);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -713,7 +706,6 @@</span><br><span>     if (conn->secondary_lchan == lchan) {</span><br><span>             LOGPLCHAN(lchan, DMSC, LOGL_NOTICE,</span><br><span>                    "lchan release on new lchan, Assignment failed\n");</span><br><span style="color: hsl(0, 100%, 40%);">-         osmo_timer_del(&conn->T10);</span><br><span>           conn->secondary_lchan = NULL;</span><br><span> </span><br><span>                 bsc_assign_fail(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, NULL);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9503">change 9503</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/9503"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ief20cb0f46dd93f46dd765dca307724dc2b3487c </div>
<div style="display:none"> Gerrit-Change-Number: 9503 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>