<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23994">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  dexter: Looks good to me, but someone else must approve
  fixeria: 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;">sched: Clean up param passing and improve logging<br><br>Change-Id: If137a2aaac7744e60564ca833a1b5564ed7d93bb<br>---<br>M src/gprs_rlcmac_sched.cpp<br>1 file changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 527d152..0068eae 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -41,8 +41,9 @@</span><br><span>   struct gprs_rlcmac_ul_tbf *ul_ack;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_ctrl_msg_tbf_candidates(const struct gprs_rlcmac_bts *bts, uint8_t trx,</span><br><span style="color: hsl(0, 100%, 40%);">-                            uint8_t ts, struct tbf_sched_candidates *tbf_cand)</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_ctrl_msg_tbf_candidates(const struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 const struct gprs_rlcmac_pdch *pdch,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  struct tbf_sched_candidates *tbf_cand)</span><br><span> {</span><br><span>  struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span>   struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span>@@ -52,7 +53,7 @@</span><br><span>               ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry);</span><br><span>                 OSMO_ASSERT(ul_tbf);</span><br><span>                 /* this trx, this ts */</span><br><span style="color: hsl(0, 100%, 40%);">-         if (ul_tbf->trx->trx_no != trx || !ul_tbf->is_control_ts(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+                if (ul_tbf->trx->trx_no != pdch->trx->trx_no || !ul_tbf->is_control_ts(pdch->ts_no))</span><br><span>                       continue;</span><br><span>            if (ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_SEND_ACK))</span><br><span>                         tbf_cand->ul_ack = ul_tbf;</span><br><span>@@ -71,7 +72,7 @@</span><br><span>            dl_tbf = as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry);</span><br><span>                 OSMO_ASSERT(dl_tbf);</span><br><span>                 /* this trx, this ts */</span><br><span style="color: hsl(0, 100%, 40%);">-         if (dl_tbf->trx->trx_no != trx || !dl_tbf->is_control_ts(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+                if (dl_tbf->trx->trx_no != pdch->trx->trx_no || !dl_tbf->is_control_ts(pdch->ts_no))</span><br><span>                       continue;</span><br><span>            if (dl_tbf->dl_ass_state_is(GPRS_RLCMAC_DL_ASS_SEND_ASS))</span><br><span>                         tbf_cand->dl_ass = dl_tbf;</span><br><span>@@ -480,7 +481,7 @@</span><br><span>  if (usf_tbf && req_mcs_kind == EGPRS && ms_mode(usf_tbf->ms()) != EGPRS)</span><br><span>          req_mcs_kind = EGPRS_GMSK;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  get_ctrl_msg_tbf_candidates(bts, trx, ts, &tbf_cand);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_ctrl_msg_tbf_candidates(bts, pdch, &tbf_cand);</span><br><span> </span><br><span>   /* Prio 1: select control message */</span><br><span>         if ((msg = sched_select_ctrl_msg(pdch, fn, block_nr, &tbf_cand))) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23994">change 23994</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-pcu/+/23994"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If137a2aaac7744e60564ca833a1b5564ed7d93bb </div>
<div style="display:none"> Gerrit-Change-Number: 23994 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>