tbf: Move pending LLC frames when merging MS objects
Currently the pending LLC packets are lost in some cases when MS
objects are merged, for instance after a RACH when there were 2 MS
object for the same MS (they get merged, when the TLLI is known for
both objects).
This patch modifies GprsMs::merge_old_ms to move all pending LLC
packets (if there are any) to the current MS object.
Sponsored-by: On-Waves ehf
diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp
index a5a6cfd..cb7773f 100644
--- a/src/gprs_ms.cpp
+++ b/src/gprs_ms.cpp
@@ -322,6 +322,8 @@
if (!ms_class() && old_ms->ms_class())
set_ms_class(old_ms->ms_class());
+ m_llc_queue.move_and_merge(&old_ms->m_llc_queue);
+
old_ms->reset();
}