diff --git a/srsenb/hdr/stack/rrc/rrc_ue.h b/srsenb/hdr/stack/rrc/rrc_ue.h index 2109f7e16..1b75741bf 100644 --- a/srsenb/hdr/stack/rrc/rrc_ue.h +++ b/srsenb/hdr/stack/rrc/rrc_ue.h @@ -38,7 +38,6 @@ public: typedef enum { MSG3_RX_TIMEOUT = 0, ///< Msg3 has its own timeout to quickly remove fake UEs from random PRACHs - UE_RESPONSE_RX_TIMEOUT, ///< General purpose timeout for responses to eNB requests UE_INACTIVITY_TIMEOUT, ///< UE inactivity timeout nulltype } activity_timeout_type_t; diff --git a/srsenb/src/stack/rrc/rrc_ue.cc b/srsenb/src/stack/rrc/rrc_ue.cc index 3a84a4c14..8d7c6b96d 100644 --- a/srsenb/src/stack/rrc/rrc_ue.cc +++ b/srsenb/src/stack/rrc/rrc_ue.cc @@ -108,11 +108,6 @@ void rrc::ue::set_activity_timeout(const activity_timeout_type_t type) deadline_ms = static_cast( (get_ue_cc_cfg(UE_PCELL_CC_IDX)->sib2.rr_cfg_common.rach_cfg_common.max_harq_msg3_tx + 1) * 16); break; - case UE_RESPONSE_RX_TIMEOUT: - // Arbitrarily chosen value to complete each UE config step, i.e. security, bearer setup, etc. - deadline_s = 1; - deadline_ms = 0; - break; case UE_INACTIVITY_TIMEOUT: deadline_s = parent->cfg.inactivity_timeout_ms / 1000; deadline_ms = parent->cfg.inactivity_timeout_ms % 1000; @@ -247,7 +242,7 @@ void rrc::ue::handle_rrc_con_req(rrc_conn_request_s* msg) send_connection_setup(); state = RRC_STATE_WAIT_FOR_CON_SETUP_COMPLETE; - set_activity_timeout(UE_RESPONSE_RX_TIMEOUT); + set_activity_timeout(UE_INACTIVITY_TIMEOUT); } void rrc::ue::send_connection_setup() @@ -371,7 +366,7 @@ void rrc::ue::handle_rrc_con_reest_req(rrc_conn_reest_request_s* msg) old_reest_rnti = old_rnti; state = RRC_STATE_WAIT_FOR_CON_REEST_COMPLETE; - set_activity_timeout(UE_RESPONSE_RX_TIMEOUT); + set_activity_timeout(UE_INACTIVITY_TIMEOUT); } else { parent->rrc_log->error("Received ConnectionReestablishment for rnti=0x%x without context\n", old_rnti); send_connection_reest_rej();