Rename tbf_alloc_ul_tbf -> ul_tbf_alloc
Use proper prefix according to the type being allocated.
Change-Id: Ic98c3c852c96c3f52f1c8f531b8d0fd28ce5aef5
diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 5bf929e..57d8a19 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -1068,7 +1068,7 @@
const bool single_slot = false;
struct gprs_rlcmac_ul_tbf *ul_tbf;
- ul_tbf = tbf_alloc_ul_tbf(ms->bts, ms, use_trx, single_slot);
+ ul_tbf = ul_tbf_alloc(ms->bts, ms, use_trx, single_slot);
if (!ul_tbf) {
LOGPMS(ms, DTBF, LOGL_NOTICE, "No PDCH resource\n");
/* Caller will most probably send a Imm Ass Reject after return */
@@ -1087,7 +1087,7 @@
const bool single_slot = true;
struct gprs_rlcmac_ul_tbf *ul_tbf;
- ul_tbf = tbf_alloc_ul_tbf(ms->bts, ms, trx_no, single_slot);
+ ul_tbf = ul_tbf_alloc(ms->bts, ms, trx_no, single_slot);
if (!ul_tbf) {
LOGP(DTBF, LOGL_NOTICE, "No PDCH resource for Uplink TBF\n");
/* Caller will most probably send a Imm Ass Reject after return */
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index 6edf8be..07f562a 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -104,7 +104,7 @@
}
/* Generic function to alloc a UL TBF, later configured to be assigned either over CCCH or PACCH */
-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot)
+struct gprs_rlcmac_ul_tbf *ul_tbf_alloc(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot)
{
struct gprs_rlcmac_ul_tbf *tbf;
int rc;
diff --git a/src/tbf_ul.h b/src/tbf_ul.h
index 0812b9d..014b167 100644
--- a/src/tbf_ul.h
+++ b/src/tbf_ul.h
@@ -132,7 +132,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot);
+struct gprs_rlcmac_ul_tbf *ul_tbf_alloc(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot);
void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta);
void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta);
struct gprs_rlcmac_ul_tbf *tbf_as_ul_tbf(struct gprs_rlcmac_tbf *tbf);