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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: Improve logging about prim being out of range<br><br>Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b<br>---<br>M src/common/scheduler.c<br>1 file changed, 7 insertions(+), 5 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 e55b3a4..e1e7c95 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -635,7 +635,7 @@</span><br><span> {</span><br><span>    struct msgb *msg, *msg2;</span><br><span>     struct osmo_phsap_prim *l1sap;</span><br><span style="color: hsl(0, 100%, 40%);">-  uint32_t prim_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+     uint32_t prim_fn, l1sap_fn;</span><br><span>  uint8_t chan_nr, link_id;</span><br><span>    struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span> </span><br><span>@@ -655,22 +655,24 @@</span><br><span>           case PRIM_PH_DATA:</span><br><span>                   chan_nr = l1sap->u.data.chan_nr;</span><br><span>                  link_id = l1sap->u.data.link_id;</span><br><span style="color: hsl(0, 100%, 40%);">-                     prim_fn = ((l1sap->u.data.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME);</span><br><span style="color: hsl(120, 100%, 40%);">+                     l1sap_fn = l1sap->u.data.fn;</span><br><span>                      break;</span><br><span>               case PRIM_TCH:</span><br><span>                       chan_nr = l1sap->u.tch.chan_nr;</span><br><span>                   link_id = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                    prim_fn = ((l1sap->u.tch.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME);</span><br><span style="color: hsl(120, 100%, 40%);">+                      l1sap_fn = l1sap->u.tch.fn;</span><br><span>                       break;</span><br><span>               default:</span><br><span>                     goto wrong_type;</span><br><span>             }</span><br><span style="color: hsl(120, 100%, 40%);">+             prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME);</span><br><span>               if (prim_fn > 100) {</span><br><span>                      LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                         "Prim %u is out of range (100), or channel %s with "</span><br><span style="color: hsl(120, 100%, 40%);">+                        "Prim %u is out of range (%u vs exp %u), or channel %s with "</span><br><span>                              "type %s is already disabled. If this happens in "</span><br><span>                         "conjunction with PCU, increase 'rts-advance' by 5.\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                       prim_fn, get_lchan_by_chan_nr(l1t->trx, chan_nr)->name,</span><br><span style="color: hsl(120, 100%, 40%);">+                         prim_fn, l1sap_fn, fn,</span><br><span style="color: hsl(120, 100%, 40%);">+                        get_lchan_by_chan_nr(l1t->trx, chan_nr)->name,</span><br><span>                         trx_chan_desc[chan].name);</span><br><span>                      /* unlink and free message */</span><br><span>                        llist_del(&msg->list);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18856">change 18856</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/+/18856"/><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: Ie7ea210fee1f59ece3abe171b64cdc04670c344b </div>
<div style="display:none"> Gerrit-Change-Number: 18856 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>