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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: _sched_dequeue_prim(): Refactor found_msg goto path<br><br>Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5<br>---<br>M src/common/scheduler.c<br>1 file changed, 11 insertions(+), 14 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 ed7d412..c1bd19f 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -679,24 +679,21 @@</span><br><span>                       return NULL;</span><br><span> </span><br><span>             /* l1sap_fn == fn */</span><br><span style="color: hsl(0, 100%, 40%);">-            goto found_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+               if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn))</span><br><span style="color: hsl(120, 100%, 40%);">+             || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, "</span><br><span style="color: hsl(120, 100%, 40%);">+                          "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id,</span><br><span style="color: hsl(120, 100%, 40%);">+                               trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+                       goto free_msg;</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%);">+           /* unlink and return message */</span><br><span style="color: hsl(120, 100%, 40%);">+               llist_del(&msg->list);</span><br><span style="color: hsl(120, 100%, 40%);">+         return msg;</span><br><span>  }</span><br><span> </span><br><span>        return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-found_msg:</span><br><span style="color: hsl(0, 100%, 40%);">-      if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn))</span><br><span style="color: hsl(0, 100%, 40%);">-       || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) {</span><br><span style="color: hsl(0, 100%, 40%);">-             LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, "</span><br><span style="color: hsl(0, 100%, 40%);">-                    "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id,</span><br><span style="color: hsl(0, 100%, 40%);">-                 trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id);</span><br><span style="color: hsl(0, 100%, 40%);">-         goto free_msg;</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%);">-       /* unlink and return message */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&msg->list);</span><br><span style="color: hsl(0, 100%, 40%);">-   return msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> free_msg:</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/+/18861">change 18861</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/+/18861"/><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: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 </div>
<div style="display:none"> Gerrit-Change-Number: 18861 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>