From 5a540e93e4a9df7d78aa866cdf3bdfe1b78ff2e6 Mon Sep 17 00:00:00 2001
From: Vignesh Babu <ns3-dev@esk.fraunhofer.de>
Date: Fri, 12 Apr 2019 13:58:42 +0200
Subject: [PATCH] lte: Remove UE from RRC protocol upon UE removal

---
 src/lte/model/lte-enb-rrc.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc
index 326a21936..e40f1a372 100644
--- a/src/lte/model/lte-enb-rrc.cc
+++ b/src/lte/model/lte-enb-rrc.cc
@@ -2794,7 +2794,12 @@ LteEnbRrc::RemoveUe (uint16_t rnti)
     }
   m_ccmRrcSapProvider-> RemoveUe (rnti);
   // need to do this after UeManager has been deleted
-  RemoveSrsConfigurationIndex (srsCi);
+  if (srsCi != 0)
+    {
+      RemoveSrsConfigurationIndex (srsCi);
+    }
+
+  m_rrcSapUser->RemoveUe (rnti); // Remove UE context at RRC protocol
 }
 
 TypeId