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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: treat subsequent lchan (de)activation as error<br><br>Trying to (de)activate logical channels that are already (de)activated<br>is not something that we normally expect.  Treat this as error.<br><br>Change-Id: I6256280cae35b2b4d7a8ba4b3913ca69cde22611<br>---<br>M src/common/scheduler.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 3dc4db5..8cb9bd4 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -974,8 +974,8 @@</span><br><span>     uint8_t tn = L1SAP_CHAN2TS(chan_nr);</span><br><span>         struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span>       uint8_t ss = l1sap_chan2ss(chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+  bool found = false;</span><br><span>  int i;</span><br><span style="color: hsl(0, 100%, 40%);">-  int rc = -EINVAL;</span><br><span> </span><br><span>        /* look for all matching chan_nr/link_id */</span><br><span>  for (i = 0; i < _TRX_CHAN_MAX; i++) {</span><br><span>@@ -985,10 +985,10 @@</span><br><span>                     continue;</span><br><span>            if (trx_chan_desc[i].link_id != link_id)</span><br><span>                     continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               rc = 0;</span><br><span>              if (chan_state->active == active)</span><br><span>                         continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             found = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>              LOGP(DL1C, LOGL_NOTICE, "%s %s on trx=%d ts=%d\n",</span><br><span>                         (active) ? "Activating" : "Deactivating",</span><br><span>                        trx_chan_desc[i].name, l1t->trx->nr, tn);</span><br><span>@@ -1018,7 +1018,7 @@</span><br><span>      if (!active)</span><br><span>                 _sched_act_rach_det(l1t, tn, ss, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    return found ? 0 : -EINVAL;</span><br><span> }</span><br><span> </span><br><span> /* setting all logical channels given attributes to active/inactive */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20698">change 20698</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/+/20698"/><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: I6256280cae35b2b4d7a8ba4b3913ca69cde22611 </div>
<div style="display:none"> Gerrit-Change-Number: 20698 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <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-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>