<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20493">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: use llist_for_each_entry() in pcu_sock_close()<br><br>Using gsm_bts_trx_num() involves redundant iterations over the<br>list of transceivers - we definitely don't want them.<br><br>Change-Id: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f<br>---<br>M src/common/pcu_sock.c<br>1 file changed, 5 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 7f7f7cf..d54e385 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -883,7 +883,7 @@</span><br><span>         struct gsm_bts *bts;</span><br><span>         struct gsm_bts_trx *trx;</span><br><span>     struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(0, 100%, 40%);">-      int i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+     unsigned int tn;</span><br><span> </span><br><span>         /* FIXME: allow multiple BTS */</span><br><span>      bts = llist_entry(state->net->bts_list.next, struct gsm_bts, list);</span><br><span>@@ -910,13 +910,10 @@</span><br><span>    osmo_signal_dispatch(SS_GLOBAL, S_NEW_SYSINFO, bts);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* release PDCH */</span><br><span style="color: hsl(0, 100%, 40%);">-      for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-            trx = gsm_bts_trx_num(bts, i);</span><br><span style="color: hsl(0, 100%, 40%);">-          if (!trx)</span><br><span style="color: hsl(0, 100%, 40%);">-                       break;</span><br><span style="color: hsl(0, 100%, 40%);">-          for (j = 0; j < 8; j++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    ts = &trx->ts[j];</span><br><span style="color: hsl(120, 100%, 40%);">+      /* Deactivate all active PDCH timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+    llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+              for (tn = 0; tn < 8; tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+                       ts = &trx->ts[tn];</span><br><span>                    if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED</span><br><span>                      && ts->pchan == GSM_PCHAN_PDCH) {</span><br><span>                                ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20493">change 20493</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/+/20493"/><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: I4bd40ffcc1e925412a21b0a934bbfdeddbc6ad1f </div>
<div style="display:none"> Gerrit-Change-Number: 20493 </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>