From 82e4b9e2384478c92e5772340b8483401868bd2c Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Wed, 1 Jun 2022 16:27:49 +0100
Subject: [PATCH] lib,pdcp_nr: fix discard timer not being stopped correctly

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

diff --git a/lib/src/pdcp/pdcp_entity_nr.cc b/lib/src/pdcp/pdcp_entity_nr.cc
index 306fbac75..7cb4e97be 100644
--- a/lib/src/pdcp/pdcp_entity_nr.cc
+++ b/lib/src/pdcp/pdcp_entity_nr.cc
@@ -308,6 +308,11 @@ void pdcp_entity_nr::write_pdu(unique_byte_buffer_t pdu)
 void pdcp_entity_nr::notify_delivery(const pdcp_sn_vector_t& pdcp_sns)
 {
   logger.debug("Received delivery notification from RLC. Nof SNs=%ld", pdcp_sns.size());
+  for (uint32_t sn : pdcp_sns) {
+    // Remove timer from map
+    logger.debug("Stopping discard timer for SN=%ld", sn);
+    discard_timers_map.erase(sn);
+  }
 }
 
 void pdcp_entity_nr::notify_failure(const pdcp_sn_vector_t& pdcp_sns)