diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-08-31 14:32:05 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-09-01 11:48:25 +0200 |
| commit | cf6ae9d12f9bf406a8f164f8109410d01328d913 (patch) | |
| tree | 656b396ba277b32d4ef5c97f243454074d11b16c /src/tbf.cpp | |
| parent | af75ce8e15ec8584cbc96a0cd366a5df68b9dae8 (diff) | |
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
Diffstat (limited to 'src/tbf.cpp')
| -rw-r--r-- | src/tbf.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp index 42d522bd..59877543 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -986,8 +986,6 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len) } old_ms = bts->ms_by_tlli(new_tlli); - /* Keep the old MS object for the update_ms() */ - GprsMs::Guard guard(old_ms); if (old_ms) { /* Get them before calling set_ms() */ dl_tbf = old_ms->dl_tbf(); @@ -998,7 +996,7 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len) /* there might be an active and valid downlink TBF */ if (!ms()->dl_tbf() && dl_tbf) - /* Move it to the current MS (see the guard above) */ + /* Move it to the current MS */ dl_tbf->set_ms(ms()); } |