Move timer X2002 to tbf_fsm
Related: OS#2709
Change-Id: I94b71c60ed49d51ebdf6d6b428056b4b94354676
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 10492d9..bed7a08 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -191,7 +191,6 @@
gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(struct gprs_rlcmac_bts *bts_, GprsMs *ms) :
gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_DL_TBF),
m_tx_counter(0),
- m_wait_confirm(0),
m_dl_ack_requested(false),
m_last_dl_poll_fn(-1),
m_last_dl_drained_fn(-1),
@@ -622,7 +621,6 @@
if ((pgroup = imsi2paging_group(imsi())) > 999)
LOGPTBFDL(this, LOGL_ERROR, "IMSI to paging group failed! (%s)\n", imsi());
bts_snd_dl_ass(bts, this, pgroup);
- m_wait_confirm = 1;
}
}
@@ -1170,7 +1168,6 @@
/* reset rlc states */
m_tx_counter = 0;
- m_wait_confirm = 0;
m_window.reset();
osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_ASSIGN_DEL_CCCH, NULL);
@@ -1464,3 +1461,8 @@
else
return NULL;
}
+
+void tbf_dl_trigger_ass(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf)
+{
+ return tbf->trigger_ass(old_tbf);
+}