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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_sock: fix pcu_sock_close(): deactivate dynamic timeslots too<br><br>Change-Id: Ib0efa6e1e2a68ac9675a18487b79d9b14bdb22c5<br>Fixes: OS#4785<br>---<br>M src/common/pcu_sock.c<br>1 file changed, 9 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index d54e385..6040de5 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -882,7 +882,6 @@</span><br><span>      struct osmo_fd *bfd = &state->conn_bfd;</span><br><span>       struct gsm_bts *bts;</span><br><span>         struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct gsm_bts_trx_ts *ts;</span><br><span>   unsigned int tn;</span><br><span> </span><br><span>         /* FIXME: allow multiple BTS */</span><br><span>@@ -913,13 +912,15 @@</span><br><span>      /* Deactivate all active PDCH timeslots */</span><br><span>   llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span>             for (tn = 0; tn < 8; tn++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 ts = &trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED</span><br><span style="color: hsl(0, 100%, 40%);">-                         && ts->pchan == GSM_PCHAN_PDCH) {</span><br><span style="color: hsl(0, 100%, 40%);">-                           ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU;</span><br><span style="color: hsl(0, 100%, 40%);">-                               l1sap_chan_rel(trx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                     gsm_lchan2chan_nr(&ts->lchan[0]));</span><br><span style="color: hsl(0, 100%, 40%);">-                       }</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                    if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+                             continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                     if (!ts_should_be_pdch(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+                           continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                   ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU;</span><br><span style="color: hsl(120, 100%, 40%);">+                     l1sap_chan_rel(trx, gsm_lchan2chan_nr(&ts->lchan[0]));</span><br><span>                }</span><br><span>    }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20494">change 20494</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-bts/+/20494"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib0efa6e1e2a68ac9675a18487b79d9b14bdb22c5 </div>
<div style="display:none"> Gerrit-Change-Number: 20494 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <vyanitskiy@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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>