<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25772">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;">Return void in tbf_assign_control_ts()<br><br>This operation cannot fail, hence let's simplify code.<br><br>Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>2 files changed, 4 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 153ba80..af15c72 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -326,7 +326,7 @@</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span>       if (tbf->control_ts == TBF_CONTROL_TS_UNSET)</span><br><span>              LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n",</span><br><span>@@ -335,8 +335,6 @@</span><br><span>           LOGPTBF(tbf, LOGL_INFO, "Changing Control TS %d -> %d\n",</span><br><span>                       tbf->control_ts, tbf->first_common_ts);</span><br><span>        tbf->control_ts = tbf->first_common_ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   return 0;</span><br><span> }</span><br><span> </span><br><span> void gprs_rlcmac_tbf::n_reset(enum tbf_counters n)</span><br><span>@@ -660,13 +658,8 @@</span><br><span>              bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL);</span><br><span>                return -1;</span><br><span>   }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* assign control ts */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = tbf_assign_control_ts(this);</span><br><span style="color: hsl(0, 100%, 40%);">-       /* if no resource */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGPTBF(this, LOGL_ERROR, "Failed to assign control TS\n");</span><br><span style="color: hsl(0, 100%, 40%);">-           return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(120, 100%, 40%);">+     /* assign initial control ts */</span><br><span style="color: hsl(120, 100%, 40%);">+       tbf_assign_control_ts(this);</span><br><span> </span><br><span>     /* set timestamp */</span><br><span>  osmo_clock_gettime(CLOCK_MONOTONIC, &meas.rssi_tv);</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 05beed5..cab9364 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -142,7 +142,7 @@</span><br><span> bool tbf_is_tfi_assigned(const struct gprs_rlcmac_tbf *tbf);</span><br><span> uint8_t tbf_tfi(const struct gprs_rlcmac_tbf *tbf);</span><br><span> bool tbf_is_egprs_enabled(const struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf);</span><br><span> int tbf_check_polling(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts, uint32_t *poll_fn, unsigned int *rrbp);</span><br><span> void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum pdch_ulc_tbf_poll_reason t);</span><br><span> void tbf_poll_timeout(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25772">change 25772</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/+/25772"/><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: I5675df4b6309d680d1d5e2dbea87991468f30630 </div>
<div style="display:none"> Gerrit-Change-Number: 25772 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>