From 52a3053ac058d63a7f728708329f6f8f09c77164 Mon Sep 17 00:00:00 2001
From: Xu Bo <xubo1@cn.fujtisu.com>
Date: Mon, 8 Jan 2018 22:28:54 +0900
Subject: [PATCH] Modify Merge branch issue271_hundreds_of_ues into ues_test
---
openair2/RRC/LITE/defs.h | 2 --
openair2/RRC/LITE/rrc_eNB.c | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/openair2/RRC/LITE/defs.h b/openair2/RRC/LITE/defs.h
index 8c1ed7c215..0a66184998 100644
--- a/openair2/RRC/LITE/defs.h
+++ b/openair2/RRC/LITE/defs.h
@@ -451,14 +451,12 @@ typedef struct eNB_RRC_UE_s {
uint32_t ul_failure_timer;
uint32_t ue_release_timer;
uint32_t ue_release_timer_thres;
-#ifdef UE_EXPANSION
uint32_t ue_release_timer_s1;
uint32_t ue_release_timer_thres_s1;
uint32_t ue_release_timer_rrc;
uint32_t ue_release_timer_thres_rrc;
uint32_t ue_reestablishment_timer;
uint32_t ue_reestablishment_timer_thres;
-#endif
uint8_t e_rab_release_command_flag;
} eNB_RRC_UE_t;
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 1a31d3d700..ecf6eed912 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1196,7 +1196,7 @@ rrc_eNB_generate_RRCConnectionReestablishment(
ue_context_pP->ue_context.ue_reestablishment_timer_thres = 1000;
#else
// activate release timer, if RRCComplete not received after 10 frames, remove UE
- //ue_context_pP->ue_context.ue_release_timer = 1;
+ ue_context_pP->ue_context.ue_release_timer = 1;
// remove UE after 10 frames after RRCConnectionReestablishmentRelease is triggered
ue_context_pP->ue_context.ue_release_timer_thres = 100;
#endif
@@ -1894,7 +1894,7 @@ rrc_eNB_generate_RRCConnectionRelease(
ue_context_pP->ue_context.ue_release_timer_s1 = 0;
#else
// set release timer
- //ue_context_pP->ue_context.ue_release_timer=1;
+ ue_context_pP->ue_context.ue_release_timer=1;
// remove UE after 10 frames after RRCConnectionRelease is triggered
ue_context_pP->ue_context.ue_release_timer_thres=100;
#endif
@@ -5142,7 +5142,7 @@ rrc_eNB_generate_RRCConnectionSetup(
ue_context_pP->ue_context.ue_release_timer_thres=1000;
#else
// activate release timer, if RRCSetupComplete not received after 10 frames, remove UE
- //ue_context_pP->ue_context.ue_release_timer=1;
+ ue_context_pP->ue_context.ue_release_timer=1;
// remove UE after 10 frames after RRCConnectionRelease is triggered
ue_context_pP->ue_context.ue_release_timer_thres=100;
#endif
--
GitLab