From 119fde090e785f5bdf01bad78631750e6eeb404b Mon Sep 17 00:00:00 2001
From: Natale Patriciello <natale.patriciello@gmail.com>
Date: Fri, 8 Mar 2019 11:15:04 +0100
Subject: [PATCH] Revert "lte: Merge branch 'lte-rlc-fix-pdu-delivering', MR
 !30"

This reverts commit 50cfb45bd126fed8936b204c7ad02ecc1d6cba4c, reversing
changes made to ae2f33cf73256fd20419507f96705df6eb884eba.

The commit is faulty because it does not consider LTE HARQ timings.
So, in LTE, would happen that a packet is delivered even in the case that the
previous packet is under HARQ retransmission.

We will check the standard and see what does apply in this case.

Natale
---
 src/lte/model/lte-rlc-um.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc
index 353f3e7de..794571591 100644
--- a/src/lte/model/lte-rlc-um.cc
+++ b/src/lte/model/lte-rlc-um.cc
@@ -485,11 +485,11 @@ LteRlcUm::DoReceivePdu (LteMacSapUser::ReceivePduParameters rxPduParams)
     {
       NS_LOG_LOGIC ("SN is outside the reordering window");
 
-      ReassembleOutsideWindow ();
-
       m_vrUh = seqNumber + 1;
       NS_LOG_LOGIC ("New VR(UH) = " << m_vrUh);
 
+      ReassembleOutsideWindow ();
+
       if ( ! IsInsideReorderingWindow (m_vrUr) )
         {
           m_vrUr = m_vrUh - m_windowSize;