From 1c196a9eff54c115923f26ded3a9f706442a7b9c Mon Sep 17 00:00:00 2001
From: Louis Adrien Dufrene <swmt1841@yd-CZC6227X3N.orangeai.mey>
Date: Mon, 5 Nov 2018 16:48:50 +0100
Subject: [PATCH] rrc inactivity timer reset in RRC Connection Release
 generation

---
 openair2/ENB_APP/enb_config.c | 3 +--
 openair2/RRC/LTE/rrc_eNB.c    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 40d9551ef2..036a4cdd91 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -2283,8 +2283,7 @@ int RCconfig_S1(
             /* Default DRX param */
             /*
             * Here we get the config of the first CC, since the s1ap_register_enb_req_t doesn't support multiple CC.
-            * It is not clear in the spec if the eNB can have different default paging values in case of several SIB2 from the same eNB.
-            * Yet, from the spec and logically, there should be a unique value associated with eNB.
+            * There is a unique value of defaultPagingCycle per eNB (same for multiple cells).
             * Hence, it should be stated somewhere that the value should be the same for every CC, or put the value outside the CC
             * in the conf file.
             */
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 8673567e6b..d63b289e32 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -2023,6 +2023,7 @@ rrc_eNB_generate_RRCConnectionRelease(
 
   ue_context_pP->ue_context.ue_reestablishment_timer = 0;
   ue_context_pP->ue_context.ue_release_timer = 0;
+  ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
 
   LOG_I(RRC,
     PROTOCOL_RRC_CTXT_UE_FMT" Logical Channel DL-DCCH, Generate RRCConnectionRelease (bytes %d)\n",
-- 
2.26.2