<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21174">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;">sched: Fix sending GSMTAP DL data blocks with unset USF<br><br>Change-Id: Ib5ceb83a85b517ee9bf2c59cf27fe818373abe60<br>---<br>M src/gprs_rlcmac_sched.cpp<br>1 file changed, 7 insertions(+), 3 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 40b2f91..706fbb5 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -388,6 +388,7 @@</span><br><span> uint8_t usf = 0x7;</span><br><span> struct msgb *msg = NULL;</span><br><span> uint32_t poll_fn, sba_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum pcu_gsmtap_category gsmtap_cat;</span><br><span> </span><br><span> if (trx >= 8 || ts >= 8)</span><br><span> return -EINVAL;</span><br><span>@@ -426,19 +427,19 @@</span><br><span> /* Prio 1: select control message */</span><br><span> msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, ul_ass_tbf,</span><br><span> dl_ass_tbf, ul_ack_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_CTRL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_cat = PCU_GSMTAP_C_DL_CTRL;</span><br><span> </span><br><span> /* Prio 2: select data message for downlink */</span><br><span> if (!msg) {</span><br><span> msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch);</span><br><span style="color: hsl(0, 100%, 40%);">- tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_DATA_GPRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_cat = PCU_GSMTAP_C_DL_DATA_GPRS;</span><br><span> }</span><br><span> </span><br><span> /* Prio 3: send dummy contol message */</span><br><span> if (!msg) {</span><br><span> /* increase counter */</span><br><span> msg = sched_dummy();</span><br><span style="color: hsl(0, 100%, 40%);">- tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_DUMMY);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_cat = PCU_GSMTAP_C_DL_DUMMY;</span><br><span> }</span><br><span> </span><br><span> if (!msg)</span><br><span>@@ -453,6 +454,9 @@</span><br><span> /* Used to measure the leak rate, count all blocks */</span><br><span> gprs_bssgp_update_frames_sent();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send to GSMTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ tap_n_acc(msg, bts, trx, ts, fn, gsmtap_cat);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* send PDTCH/PACCH to L1 */</span><br><span> pcu_l1if_tx_pdtch(msg, trx, ts, bts->trx[trx].arfcn, fn, block_nr);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21174">change 21174</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/+/21174"/><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: Ib5ceb83a85b517ee9bf2c59cf27fe818373abe60 </div>
<div style="display:none"> Gerrit-Change-Number: 21174 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>