diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-05-20 12:06:46 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-05-27 13:29:59 +0200 |
| commit | 767193e20b4172dfb0e76ec63444115dc5ae8806 (patch) | |
| tree | db3cf75b01e916afa5ce994e239111c454113382 /tests/alloc | |
| parent | d1cb41bfd020eb9b94b17e5bcaa5be36bceccc12 (diff) | |
tbf: Remove the TLLI from the TBFs
Currently the TLLI is stored in each TBF. Since each MS is now
represented by a GprsMs object which takes care of TLLI updating,
and each TBF that has been associated with an TLLI also contains a
reference to a GprsMs object, per TBF TLLI handling is no longer
needed. Keeping all TBF m_tlli members up to date is complex and
doesn't currently work correctly in all circumstances.
This commit removes m_tlli and related members from the TBF class and
the tbf_by_tlli functions from the BTS class.
Ticket: #1674
Sponsored-by: On-Waves ehf
Diffstat (limited to 'tests/alloc')
| -rw-r--r-- | tests/alloc/AllocTest.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index e453de6a..552d8aa8 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -188,18 +188,14 @@ static void test_alloc_b(int ms_class) tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); dl_tbf = tbf_alloc_dl_tbf(bts, NULL, tfi, trx_no, ms_class, 1); - dl_tbf->m_tlli = 0x23; - dl_tbf->m_tlli_valid = true; - dl_tbf->update_ms(dl_tbf->m_tlli, GPRS_RLCMAC_DL_TBF); + dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); OSMO_ASSERT(dl_tbf); dump_assignment(dl_tbf, "DL"); tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf, tfi, trx_no, ms_class, 0); - ul_tbf->m_tlli = 0x23; - ul_tbf->m_tlli_valid = true; - ul_tbf->update_ms(ul_tbf->m_tlli, GPRS_RLCMAC_UL_TBF); + ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; OSMO_ASSERT(ul_tbf); dump_assignment(ul_tbf, "UL"); @@ -348,17 +344,13 @@ static void test_alloc_b(bool ts0, bool ts1, bool ts2, bool ts3, bool ts4, bool OSMO_ASSERT(tfi >= 0); dl_tbf = tbf_alloc_dl_tbf(bts, NULL, tfi, trx_no, ms_class, 1); OSMO_ASSERT(dl_tbf); - dl_tbf->m_tlli = 0x23; - dl_tbf->m_tlli_valid = true; - dl_tbf->update_ms(dl_tbf->m_tlli, GPRS_RLCMAC_DL_TBF); + dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf, tfi, trx_no, ms_class, 0); OSMO_ASSERT(ul_tbf); - ul_tbf->m_tlli = 0x23; - ul_tbf->m_tlli_valid = true; - ul_tbf->update_ms(ul_tbf->m_tlli, GPRS_RLCMAC_UL_TBF); + ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; OSMO_ASSERT(dl_tbf->first_common_ts == ul_tbf->first_common_ts); |