<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20693">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: ensure PRIM_OP_REQUEST when adding to the queue<br><br>Change-Id: I709ba2394862fcb0f86484792b5f8d3b338b42cc<br>---<br>M src/common/scheduler.c<br>1 file changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/20693/1</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 e7cbc83..f0b8c31 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -651,10 +651,6 @@</span><br><span>    /* get prim of current fn from queue */</span><br><span>      llist_for_each_entry_safe(msg, msg2, &l1ts->dl_prims, list) {</span><br><span>                 l1sap = msgb_l1sap_prim(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-           if (l1sap->oph.operation != PRIM_OP_REQUEST) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                        goto free_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span>            switch (l1sap->oph.primitive) {</span><br><span>           case PRIM_PH_DATA:</span><br><span>                   chan_nr = l1sap->u.data.chan_nr;</span><br><span>@@ -806,6 +802,7 @@</span><br><span>            "PH-DATA.req: chan_nr=0x%02x link_id=0x%02x\n",</span><br><span>            l1sap->u.data.chan_nr, l1sap->u.data.link_id);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST);</span><br><span>     OSMO_ASSERT(l1sap->oph.msg);</span><br><span> </span><br><span>  /* ignore empty frame */</span><br><span>@@ -827,6 +824,7 @@</span><br><span>       LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.tch.fn, "TCH.req: chan_nr=0x%02x\n",</span><br><span>             l1sap->u.tch.chan_nr);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST);</span><br><span>     OSMO_ASSERT(l1sap->oph.msg);</span><br><span> </span><br><span>  /* ignore empty frame */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20693">change 20693</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/+/20693"/><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: I709ba2394862fcb0f86484792b5f8d3b338b42cc </div>
<div style="display:none"> Gerrit-Change-Number: 20693 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>