From eb819cb9d0e211219c9b2de3632b69e5652d4abe Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Wed, 1 Jun 2022 16:35:18 +0100
Subject: [PATCH] lib,pdcp_nr: fix RX_DELIV update when t-Reordering expires

---
 lib/src/pdcp/pdcp_entity_nr.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/pdcp/pdcp_entity_nr.cc b/lib/src/pdcp/pdcp_entity_nr.cc
index 7cb4e97be..a48f863bf 100644
--- a/lib/src/pdcp/pdcp_entity_nr.cc
+++ b/lib/src/pdcp/pdcp_entity_nr.cc
@@ -367,6 +367,9 @@ void pdcp_entity_nr::reordering_callback::operator()(uint32_t timer_id)
     parent->pass_to_upper_layers(std::move(it->second));
   }
 
+  // Update RX_DELIV to the first PDCP SDU not delivered to the upper layers
+  parent->rx_deliv = parent->rx_reord;
+
   // Deliver all PDCP SDU(s) consecutively associated COUNT value(s) starting from RX_REORD
   parent->deliver_all_consecutive_counts();