diff options
author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-08-18 11:55:03 +0200 |
---|---|---|
committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-08-18 11:55:03 +0200 |
commit | 2b349b5d33050f6484c375e545ecb9f05a6be961 (patch) | |
tree | b7969962b60bc2b0dd27f2c56e3dd8501ddb792b /src/tbf_dl.cpp | |
parent | ebebad1c92e8bcbe28780b4d5ee2ac32091089ff (diff) |
ms: Move MS information merging to GprsMS
Currently the merging of the meta information (MS class, IMSI) takes
place in gprs_rlcmac_tbf::merge_and_clear_ms(). This makes it
difficult to merge the internal state and does not directly relate to
TBFs anyway.
This commit moves this into a new method GprsMs::merge_old_ms.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/tbf_dl.cpp')
-rw-r--r-- | src/tbf_dl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 1bc08b77..a0510f66 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -230,7 +230,7 @@ int gprs_rlcmac_dl_tbf::handle(struct gprs_rlcmac_bts *bts, if (ms_old->dl_tbf() && ms_old->dl_tbf()->T == 0) tbf_free(ms_old->dl_tbf()); - ms_old->reset(); + ms->merge_old_ms(ms_old); } } |