From 7fde6e49334f90d912418bff2d4e247d4522ab86 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Wed, 7 Feb 2018 16:34:10 +0100
Subject: [PATCH] rlc_am: fix conditions for resetting re-ordering timer

---
 lib/src/upper/rlc_am.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/src/upper/rlc_am.cc b/lib/src/upper/rlc_am.cc
index 2ecb862d5..14ce81292 100644
--- a/lib/src/upper/rlc_am.cc
+++ b/lib/src/upper/rlc_am.cc
@@ -892,12 +892,7 @@ void rlc_am::handle_data_pdu(uint8_t *payload, uint32_t nof_bytes, rlc_amd_pdu_h
   // Update reordering variables and timers (36.322 v10.0.0 Section 5.1.3.2.3)
   if(reordering_timeout.is_running())
   {
-    if(
-       vr_x == vr_r ||
-       (RX_MOD_BASE(vr_x) < RX_MOD_BASE(vr_r)  ||
-        (RX_MOD_BASE(vr_x) > RX_MOD_BASE(vr_mr) &&
-        vr_x != vr_mr))
-       )
+    if(vr_x == vr_r || (!inside_rx_window(vr_x) && vr_x != vr_mr))
     {
       reordering_timeout.reset();
     }