From aebea06f15dabf5af625f6c15076119ac25e643d Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 9 Oct 2018 15:38:29 +0200 Subject: [PATCH] fix RLC UM timer expiration after stopping entity --- lib/src/upper/rlc_um.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/src/upper/rlc_um.cc b/lib/src/upper/rlc_um.cc index 06feb7451..eba812d53 100644 --- a/lib/src/upper/rlc_um.cc +++ b/lib/src/upper/rlc_um.cc @@ -939,9 +939,8 @@ void rlc_um::rlc_um_rx::reset_metrics() void rlc_um::rlc_um_rx::timer_expired(uint32_t timeout_id) { - if (reordering_timer_id == timeout_id) { - pthread_mutex_lock(&mutex); - + pthread_mutex_lock(&mutex); + if (reordering_timer != NULL && reordering_timer_id == timeout_id) { // 36.322 v10 Section 5.1.2.2.4 log->info("%s reordering timeout expiry - updating vr_ur and reassembling\n", get_rb_name()); @@ -965,8 +964,8 @@ void rlc_um::rlc_um_rx::timer_expired(uint32_t timeout_id) } debug_state(); - pthread_mutex_unlock(&mutex); } + pthread_mutex_unlock(&mutex); } /****************************************************************************