tbf: Merge handle_ack_nack() into rcvd_dl_ack()
There's no real use in having those 2 methods separately, and only adds
complexity. Let's merge it to have 1 TBF code path handling DL ACK/NACK.
Change-Id: I546d2e46bda96a2f551b28673464e57831c71828
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 40b52e5..10492d9 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -774,22 +774,6 @@
return bsn;
}
-bool gprs_rlcmac_dl_tbf::handle_ack_nack()
-{
- bool ack_recovered = false;
-
- state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_DL_ACK);
- if (check_n_clear(GPRS_RLCMAC_FLAG_TO_DL_ACK)) {
- ack_recovered = true;
- }
-
- /* reset N3105 */
- n_reset(N3105);
- t_stop(T3191, "ACK/NACK received");
-
- return ack_recovered;
-}
-
struct msgb *gprs_rlcmac_dl_tbf::create_dl_acked_block(
const uint32_t fn, const uint8_t ts,
int index, int index2)
@@ -1200,6 +1184,13 @@
int rc;
LOGPTBFDL(this, LOGL_DEBUG, "downlink acknowledge\n");
+ state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_DL_ACK);
+ state_fsm.state_flags &= ~(1 << GPRS_RLCMAC_FLAG_TO_DL_ACK);
+
+ /* reset N3105 */
+ n_reset(N3105);
+ t_stop(T3191, "ACK/NACK received");
+
rc = update_window(first_bsn, rbb);
if (final_ack) {