<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19776">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: cosmetic: use GSM_MACBLOCK_LEN where possible<br><br>Change-Id: Ib42770cb009e8d559f733ebedd058e2f0a18820a<br>---<br>M src/tbf.cpp<br>1 file changed, 9 insertions(+), 9 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 f77b1e2..b3436d8 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -1253,10 +1253,10 @@</span><br><span> }</span><br><span> </span><br><span> new_dl_tbf->was_releasing = was_releasing;</span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_alloc(23, "rlcmac_dl_ass");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_dl_ass");</span><br><span> if (!msg)</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ass_vec = bitvec_alloc(23, tall_pcu_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);</span><br><span> if (!ass_vec)</span><br><span> goto free_ret;</span><br><span> bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span>@@ -1275,7 +1275,7 @@</span><br><span> }</span><br><span> LOGP(DTBF, LOGL_DEBUG, "------------------------- TX : Packet Downlink Assignment -------------------------\n");</span><br><span> bts->do_rate_ctr_inc(CTR_PKT_DL_ASSIGNMENT);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_pack(ass_vec, msgb_put(msg, 23));</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));</span><br><span> </span><br><span> if (poll_ass_dl) {</span><br><span> set_polling(new_poll_fn, ts, GPRS_RLCMAC_POLL_DL_ASS);</span><br><span>@@ -1304,9 +1304,9 @@</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_alloc(23, "rlcmac_ul_ass_rej");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_ul_ass_rej");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec *packet_access_rej = bitvec_alloc(23, tall_pcu_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec *packet_access_rej = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);</span><br><span> </span><br><span> bitvec_unhex(packet_access_rej, DUMMY_VEC);</span><br><span> </span><br><span>@@ -1315,7 +1315,7 @@</span><br><span> </span><br><span> bts->do_rate_ctr_inc(CTR_PKT_ACCESS_REJ);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_pack(packet_access_rej, msgb_put(msg, 23));</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_pack(packet_access_rej, msgb_put(msg, GSM_MACBLOCK_LEN));</span><br><span> </span><br><span> bitvec_free(packet_access_rej);</span><br><span> ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE;</span><br><span>@@ -1358,11 +1358,11 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_alloc(23, "rlcmac_ul_ass");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_ul_ass");</span><br><span> if (!msg)</span><br><span> return NULL;</span><br><span> LOGPTBF(new_tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ass_vec = bitvec_alloc(23, tall_pcu_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);</span><br><span> if (!ass_vec)</span><br><span> goto free_ret;</span><br><span> bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span>@@ -1370,7 +1370,7 @@</span><br><span> (direction == GPRS_RLCMAC_DL_TBF), tlli(),</span><br><span> is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,</span><br><span> bts_data()->gamma, -1, is_egprs_enabled());</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_pack(ass_vec, msgb_put(msg, 23));</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));</span><br><span> </span><br><span> mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);</span><br><span> LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19776">change 19776</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/+/19776"/><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: Ib42770cb009e8d559f733ebedd058e2f0a18820a </div>
<div style="display:none"> Gerrit-Change-Number: 19776 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>