<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21175">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: Use correct GMSTAP category for EGPRS DL data blocks<br><br>Change-Id: I3bd8b6a2328e13543b7d4c4a945e86f14ff35bda<br>---<br>M src/gprs_rlcmac_sched.cpp<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/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 706fbb5..97806d9 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -273,7 +273,7 @@</span><br><span> </span><br><span> static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts,</span><br><span>                     uint8_t trx, uint8_t ts, uint32_t fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                   uint8_t block_nr, struct gprs_rlcmac_pdch *pdch)</span><br><span style="color: hsl(120, 100%, 40%);">+              uint8_t block_nr, struct gprs_rlcmac_pdch *pdch, bool *is_egprs)</span><br><span> {</span><br><span>    struct msgb *msg = NULL;</span><br><span>     struct gprs_rlcmac_dl_tbf *tbf, *prio_tbf = NULL;</span><br><span>@@ -324,6 +324,7 @@</span><br><span>              pdch->next_dl_tfi = (prio_tfi + 1) & 31;</span><br><span>              /* generate DL data block */</span><br><span>                 msg = prio_tbf->create_dl_acked_block(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+             *is_egprs = prio_tbf->ms()->mode() != GPRS;</span><br><span>    }</span><br><span> </span><br><span>        return msg;</span><br><span>@@ -362,9 +363,9 @@</span><br><span>                                  msg->len);</span><br><span>          break;</span><br><span>       case PCU_GSMTAP_C_DL_DATA_GPRS:</span><br><span style="color: hsl(120, 100%, 40%);">+       case PCU_GSMTAP_C_DL_DATA_EGPRS:</span><br><span>             bts->bts->do_rate_ctr_inc(CTR_RLC_SENT);</span><br><span style="color: hsl(0, 100%, 40%);">-          /* FIXME: distinguish between GPRS and EGPRS */</span><br><span style="color: hsl(0, 100%, 40%);">-         bts->bts->send_gsmtap(PCU_GSMTAP_C_DL_DATA_GPRS, false, trx, ts, GSMTAP_CHANNEL_PDTCH, fn, msg->data,</span><br><span style="color: hsl(120, 100%, 40%);">+                bts->bts->send_gsmtap(cat, false, trx, ts, GSMTAP_CHANNEL_PDTCH, fn, msg->data,</span><br><span>                                   msg->len);</span><br><span>          break;</span><br><span>       case PCU_GSMTAP_C_DL_DUMMY:</span><br><span>@@ -389,6 +390,7 @@</span><br><span>    struct msgb *msg = NULL;</span><br><span>     uint32_t poll_fn, sba_fn;</span><br><span>    enum pcu_gsmtap_category gsmtap_cat;</span><br><span style="color: hsl(120, 100%, 40%);">+  bool is_egprs = false;</span><br><span> </span><br><span>   if (trx >= 8 || ts >= 8)</span><br><span>               return -EINVAL;</span><br><span>@@ -431,8 +433,8 @@</span><br><span> </span><br><span>    /* Prio 2: select data message for downlink */</span><br><span>       if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">-             msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch);</span><br><span style="color: hsl(0, 100%, 40%);">-          gsmtap_cat = PCU_GSMTAP_C_DL_DATA_GPRS;</span><br><span style="color: hsl(120, 100%, 40%);">+               msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch, &is_egprs);</span><br><span style="color: hsl(120, 100%, 40%);">+         gsmtap_cat = is_egprs ? PCU_GSMTAP_C_DL_DATA_EGPRS : PCU_GSMTAP_C_DL_DATA_GPRS;</span><br><span>      }</span><br><span> </span><br><span>        /* Prio 3: send dummy contol message */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21175">change 21175</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/+/21175"/><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: I3bd8b6a2328e13543b7d4c4a945e86f14ff35bda </div>
<div style="display:none"> Gerrit-Change-Number: 21175 </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>