Commit 79cde38c authored by mathieu.plante@nutaq.com's avatar mathieu.plante@nutaq.com

Merge branch 'nrw/litecell15-next' into 'nrw/litecell15'

Nrw/litecell15 next

See merge request nrw_noa/osmo-pcu!49
parents 865a5282 36dc5be8
......@@ -1189,12 +1189,9 @@ int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, unsigned first_bsn,
uint32_t val;
uint32_t max_tbf = 0;
rc = update_window(first_bsn, rbb);
if (final_ack) {
LOGP(DRLCMACDL, LOGL_DEBUG, "- Final ACK received.\n");
rc = maybe_start_new_window();
/* calculate total number of active DL TBF */
max_tbf = bts->get_active_tbfs(&bts->dl_tbfs());
/* update maximum DL TBF */
......@@ -1202,10 +1199,16 @@ int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, unsigned first_bsn,
if (max_tbf > val)
bts->tbf_dl_max();
} else if (state_is(GPRS_RLCMAC_FINISHED) && m_window.window_empty()) {
LOGP(DRLCMACDL, LOGL_NOTICE, "Received acknowledge of "
"all blocks, but without final ack "
"indication (don't worry)\n");
} else {
if (state_is(GPRS_RLCMAC_FINISHED) && m_window.window_empty()) {
LOGP(DRLCMACDL, LOGL_NOTICE, "Received acknowledge of "
"all blocks, but without final ack "
"indication (don't worry)\n");
/* start new window anyway */
rc = maybe_start_new_window();
} else
/* update window only */
rc = update_window(first_bsn, rbb);
}
return rc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment