From 2b349b5d33050f6484c375e545ecb9f05a6be961 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Tue, 18 Aug 2015 11:55:03 +0200 Subject: 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 --- src/gprs_ms.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gprs_ms.h') diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 7f85578c..c490e7ab 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -63,6 +63,8 @@ public: void set_callback(Callback *cb) {m_cb = cb;} + void merge_old_ms(GprsMs *old_ms); + gprs_rlcmac_ul_tbf *ul_tbf() const {return m_ul_tbf;} gprs_rlcmac_dl_tbf *dl_tbf() const {return m_dl_tbf;} gprs_rlcmac_tbf *tbf(enum gprs_rlcmac_tbf_direction dir) const; -- cgit v1.2.3