Move tbf ul_ack_state to osmocom FSM
Related: OS#2709
Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30
diff --git a/src/pdch.cpp b/src/pdch.cpp
index 439759f..da43bdf 100644
--- a/src/pdch.cpp
+++ b/src/pdch.cpp
@@ -344,11 +344,10 @@
/* check if this control ack belongs to packet uplink ack */
ul_tbf = as_ul_tbf(tbf);
- if (ul_tbf && ul_tbf->handle_ctrl_ack(reason)) {
+ if (ul_tbf && reason == PDCH_ULC_POLL_UL_ACK && tbf_ul_ack_exp_ctrl_ack(ul_tbf, fn, ts_no)) {
+ osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL);
+ /* We can free since we only set polling on final UL ACK/NACK */
LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n");
- if (ul_tbf->ctrl_ack_to_toggle())
- LOGPTBF(tbf, LOGL_NOTICE, "Recovered uplink ack for UL\n");
-
tbf_free(tbf);
return;
}