Revert "tbf: Do not kill DL TBF on Packet Resource Request"
This reverts commit e91bd3babd5c04a154f296607b401a5050dcba31.
That commit seems to cause hanging DL TBFs when there was a RACH
based UL TBF establishment while it that TBF is active. This could be
caused by the use of a different PDCH for the SBA.
Conflicts:
tests/tbf/TbfTest.cpp
tests/tbf/TbfTest.err
diff --git a/src/bts.cpp b/src/bts.cpp
index cfb4385..98a23cc 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -988,11 +988,14 @@
ul_tbf = NULL;
}
- if (dl_tbf)
- LOGP(DRLCMACUL, LOGL_INFO, "Got RACH from "
- "TLLI=0x%08x while %s still exists.\n",
- tlli, tbf_name(dl_tbf));
-
+ if (dl_tbf) {
+ LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
+ "TLLI=0x%08x while %s still exists. "
+ "Killing pending DL TBF\n", tlli,
+ tbf_name(dl_tbf));
+ tbf_free(dl_tbf);
+ dl_tbf = NULL;
+ }
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF "
"in packet resource request of single "
"block, so we provide one:\n");