<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21969">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test.c: properly release lchans in set-ts-use<br><br>An upcoming test that uses set-ts-use to release used lchans uncovered<br>an incomplete release, keeping the lchans occupied due to a missing<br>release ack. Always ack the release.<br><br>Change-Id: Ia22906bfbfcc48b7bd08473a2b17f6b0554687d3<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 11 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index cbe0cf3..c0c5bb9 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -435,9 +435,20 @@</span><br><span>   return lchan_act(lchan, full_rate, codec);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void lchan_release_ack(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        if (lchan->fi && lchan->fi->state == LCHAN_ST_WAIT_BEFORE_RF_RELEASE) {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* don't wait before release */</span><br><span style="color: hsl(120, 100%, 40%);">+           osmo_fsm_inst_state_chg(lchan->fi, LCHAN_ST_WAIT_RF_RELEASE_ACK, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+            /* ack the release */</span><br><span style="color: hsl(120, 100%, 40%);">+         osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_RSL_RF_CHAN_REL_ACK, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void lchan_clear(struct gsm_lchan *lchan)</span><br><span> {</span><br><span>      lchan_release(lchan, true, false, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release_ack(lchan);</span><br><span> }</span><br><span> </span><br><span> static void ts_clear(struct gsm_bts_trx_ts *ts)</span><br><span>@@ -674,16 +685,6 @@</span><br><span>         abis_rsl_rcvmsg(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lchan_release_ack(struct gsm_lchan *lchan)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   if (lchan->fi && lchan->fi->state == LCHAN_ST_WAIT_BEFORE_RF_RELEASE) {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* don't wait before release */</span><br><span style="color: hsl(0, 100%, 40%);">-             osmo_fsm_inst_state_chg(lchan->fi, LCHAN_ST_WAIT_RF_RELEASE_ACK, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-              /* ack the release */</span><br><span style="color: hsl(0, 100%, 40%);">-           osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_RSL_RF_CHAN_REL_ACK, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* override, requires '-Wl,--wrap=abis_rsl_sendmsg'.</span><br><span>  * Catch RSL messages sent towards the BTS. */</span><br><span> int __real_abis_rsl_sendmsg(struct msgb *msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21969">change 21969</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/c/osmo-bsc/+/21969"/><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-Change-Id: Ia22906bfbfcc48b7bd08473a2b17f6b0554687d3 </div>
<div style="display:none"> Gerrit-Change-Number: 21969 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>