Move LLC enqueuing and retransmit timer to MS object
The LLC queue is already in the MS object. The LLC timer and most
of the logic to enqueue its data is independent from the TBF.
Change-Id: I56b89fcac838d8eb732b629734d5e458e9c806d1
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index c18fa77..917806a 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -312,8 +312,8 @@
llc_data[i] = i%256;
/* Schedule two LLC frames */
- dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
- dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
/* Send only a few RLC/MAC blocks */
@@ -389,8 +389,8 @@
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
/* Schedule two LLC frames */
- dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
- dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
@@ -2744,7 +2744,7 @@
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
/* Schedule a small LLC frame */
- dl_tbf->append_data(1000, test_data, 10);
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, 10);
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
@@ -2756,7 +2756,7 @@
send_empty_block(dl_tbf, dl_tbf->control_ts, fn);
/* Schedule a large LLC frame */
- dl_tbf->append_data(1000, test_data, sizeof(test_data));
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, sizeof(test_data));
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
@@ -2805,7 +2805,7 @@
* 2 RLC data blocks. Which are enough to test Header Type 1
* cases
*/
- dl_tbf->append_data(1000, test_data, 100);
+ ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, 100);
OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));