aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-06-18 15:49:52 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-06-29 10:53:32 +0200
commitace7b570a047b7ee36557091c10918240c4b8ff3 (patch)
tree7c3ba85117d4e636f0dd77b93edaa7b59352d74f
parentf1379346f7a54e6d0957932dfc90f9a62410adce (diff)
tbf: Remove update_tlli method
This method does not do anything anymore, it's functionality has been taken over by update_ms. This commit removes gprs_rlcmac_tbf::update_tlli completely. Sponsored-by: On-Waves ehf
-rw-r--r--src/bts.cpp1
-rw-r--r--src/tbf.cpp5
-rw-r--r--src/tbf.h1
-rw-r--r--tests/tbf/TbfTest.cpp3
4 files changed, 0 insertions, 10 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index 7914cfd..4ca53d5 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -712,7 +712,6 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet,
fn, tlli, trx_no(), ts_no);
return;
}
- tbf->update_tlli(tlli);
tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] %s Packet Control Ack\n", tbf_name(tbf));
diff --git a/src/tbf.cpp b/src/tbf.cpp
index ac099cf..3252d0a 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -847,10 +847,6 @@ void gprs_rlcmac_tbf::free_all(struct gprs_rlcmac_pdch *pdch)
}
}
-void gprs_rlcmac_tbf::update_tlli(uint32_t tlli)
-{
-}
-
int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len)
{
struct gprs_rlcmac_tbf *dl_tbf = NULL;
@@ -883,7 +879,6 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len)
set_ms(old_ms);
}
- update_tlli(new_tlli);
/* The TLLI has been taken from an UL message */
update_ms(new_tlli, GPRS_RLCMAC_UL_TBF);
LOGP(DRLCMACUL, LOGL_INFO, "Decoded premier TLLI=0x%08x of "
diff --git a/src/tbf.h b/src/tbf.h
index 5c6611d..0f53a27 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -139,7 +139,6 @@ struct gprs_rlcmac_tbf {
void poll_timeout();
/** tlli handling */
- void update_tlli(uint32_t tlli);
uint32_t tlli() const;
bool is_tlli_valid() const;
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 5dfd2b8..b963e37 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -76,14 +76,12 @@ static void test_tbf_tlli_update()
gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(the_bts.bts_data(),
NULL, 0,
0, 0, 0);
- dl_tbf->update_tlli(0x2342);
dl_tbf->update_ms(0x2342, GPRS_RLCMAC_DL_TBF);
dl_tbf->set_ta(4);
gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(),
dl_tbf, 0,
0, 0, 0);
- ul_tbf->update_tlli(0x2342);
ul_tbf->update_ms(0x2342, GPRS_RLCMAC_UL_TBF);
ms = the_bts.ms_by_tlli(0x2342);
@@ -96,7 +94,6 @@ static void test_tbf_tlli_update()
* Now check.. that DL changes and that the timing advance
* has changed.
*/
- dl_tbf->update_tlli(0x4232);
dl_tbf->update_ms(0x4232, GPRS_RLCMAC_DL_TBF);
/* It is still there, since the new TLLI has not been used for UL yet */