Change in osmo-pcu[master]: tbf: cosmetic: use GSM_MACBLOCK_LEN where possible

[fixeria]

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19776 )

Change subject: tbf: cosmetic: use GSM_MACBLOCK_LEN where possible
......................................................................

tbf: cosmetic: use GSM_MACBLOCK_LEN where possible

Change-Id: Ib42770cb009e8d559f733ebedd058e2f0a18820a
---
M src/tbf.cpp
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/tbf.cpp b/src/tbf.cpp
index f77b1e2..b3436d8 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -1253,10 +1253,10 @@
 	}
 
 	new_dl_tbf->was_releasing = was_releasing;
-	msg = msgb_alloc(23, "rlcmac_dl_ass");
+	msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_dl_ass");
 	if (!msg)
 		return NULL;
-	ass_vec = bitvec_alloc(23, tall_pcu_ctx);
+	ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);
 	if (!ass_vec)
 		goto free_ret;
 	bitvec_unhex(ass_vec, DUMMY_VEC);
@@ -1275,7 +1275,7 @@
 	}
 	LOGP(DTBF, LOGL_DEBUG, "------------------------- TX : Packet Downlink Assignment -------------------------\n");
 	bts->do_rate_ctr_inc(CTR_PKT_DL_ASSIGNMENT);
-	bitvec_pack(ass_vec, msgb_put(msg, 23));
+	bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));
 
 	if (poll_ass_dl) {
 		set_polling(new_poll_fn, ts, GPRS_RLCMAC_POLL_DL_ASS);
@@ -1304,9 +1304,9 @@
 {
 	struct msgb *msg;
 
-	msg = msgb_alloc(23, "rlcmac_ul_ass_rej");
+	msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_ul_ass_rej");
 
-	bitvec *packet_access_rej = bitvec_alloc(23, tall_pcu_ctx);
+	bitvec *packet_access_rej = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);
 
 	bitvec_unhex(packet_access_rej, DUMMY_VEC);
 
@@ -1315,7 +1315,7 @@
 
 	bts->do_rate_ctr_inc(CTR_PKT_ACCESS_REJ);
 
-	bitvec_pack(packet_access_rej, msgb_put(msg, 23));
+	bitvec_pack(packet_access_rej, msgb_put(msg, GSM_MACBLOCK_LEN));
 
 	bitvec_free(packet_access_rej);
 	ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE;
@@ -1358,11 +1358,11 @@
 		return NULL;
 	}
 
-	msg = msgb_alloc(23, "rlcmac_ul_ass");
+	msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_ul_ass");
 	if (!msg)
 		return NULL;
 	LOGPTBF(new_tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH)\n");
-	ass_vec = bitvec_alloc(23, tall_pcu_ctx);
+	ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);
 	if (!ass_vec)
 		goto free_ret;
 	bitvec_unhex(ass_vec, DUMMY_VEC);
@@ -1370,7 +1370,7 @@
 		(direction == GPRS_RLCMAC_DL_TBF), tlli(),
 		is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,
 		bts_data()->gamma, -1, is_egprs_enabled());
-	bitvec_pack(ass_vec, msgb_put(msg, 23));
+	bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));
 
 	mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);
 	LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n");

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19776
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib42770cb009e8d559f733ebedd058e2f0a18820a
Gerrit-Change-Number: 19776
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200824/bd7f5b07/attachment.htm>