diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 4be59273c1ca3e047d4831903316d79926c9bd1b..74e7997fba4f036eada707f3241b510185b19537 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -729,13 +729,6 @@ rrc_gNB_generate_defaultRRCReconfiguration(
LOG_DUMPMSG(NR_RRC, DEBUG_RRC,(char *)buffer, size, "[MSG] RRC Reconfiguration\n");
- if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
- nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
- ue_context_pP->ue_context.rnti,
- *rrc->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
- NR_RRC_RECONFIGURATION_DELAY_MS);
- }
-
/* Free all NAS PDUs */
for (int i = 0; i < ue_context_pP->ue_context.nb_of_pdusessions; i++) {
if (ue_context_pP->ue_context.pduSession[i].param.nas_pdu.buffer != NULL) {
@@ -804,6 +797,13 @@ rrc_gNB_generate_defaultRRCReconfiguration(
default :
LOG_W(NR_RRC, "Unknown node type %d\n", RC.nrrrc[ctxt_pP->module_id]->node_type);
}
+
+ if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
+ nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
+ ue_context_pP->ue_context.rnti,
+ *rrc->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
+ NR_RRC_RECONFIGURATION_DELAY_MS);
+ }
}
//-----------------------------------------------------------------------------
@@ -1002,13 +1002,6 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
cellGroupConfig);
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,"[MSG] RRC Reconfiguration\n");
- if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
- nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
- ue_context_pP->ue_context.rnti,
- *rrc->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
- NR_RRC_RECONFIGURATION_DELAY_MS);
- }
-
/* Free all NAS PDUs */
for (i = 0; i < ue_context_pP->ue_context.nb_of_pdusessions; i++) {
if (ue_context_pP->ue_context.pduSession[i].param.nas_pdu.buffer != NULL) {
@@ -1045,6 +1038,13 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
#endif
+
+ if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
+ nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
+ ue_context_pP->ue_context.rnti,
+ *rrc->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
+ NR_RRC_RECONFIGURATION_DELAY_MS);
+ }
}
//-----------------------------------------------------------------------------
@@ -1182,13 +1182,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
NULL);
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n");
- if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
- nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
- ue_context_pP->ue_context.rnti,
- *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
- NR_RRC_RECONFIGURATION_DELAY_MS);
- }
-
/* Free all NAS PDUs */
for (i = 0; i < ue_context_pP->ue_context.nb_of_modify_pdusessions; i++) {
if (ue_context_pP->ue_context.modify_pdusession[i].param.nas_pdu.buffer != NULL) {
@@ -1225,6 +1218,13 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
#endif
+
+ if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
+ nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
+ ue_context_pP->ue_context.rnti,
+ *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
+ NR_RRC_RECONFIGURATION_DELAY_MS);
+ }
}
//-----------------------------------------------------------------------------
@@ -1290,15 +1290,8 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
NULL);
ue_context_pP->ue_context.pdu_session_release_command_flag = 1;
-
- LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n");
-
- if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
- nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
- ue_context_pP->ue_context.rnti,
- *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
- NR_RRC_RECONFIGURATION_DELAY_MS);
- }
+ LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,
+ "[MSG] RRC Reconfiguration\n");
/* Free all NAS PDUs */
if (nas_length > 0) {
@@ -1332,6 +1325,13 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
#endif
+
+ if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
+ nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
+ ue_context_pP->ue_context.rnti,
+ *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
+ NR_RRC_RECONFIGURATION_DELAY_MS);
+ }
}
//-----------------------------------------------------------------------------
@@ -1847,15 +1847,8 @@ rrc_gNB_process_RRCConnectionReestablishmentComplete(
NULL,
NULL,
NULL);
-
- LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n");
-
- if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
- nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
- ue_context_pP->ue_context.rnti,
- *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
- NR_RRC_RECONFIGURATION_DELAY_MS);
- }
+ LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,
+ "[MSG] RRC Reconfiguration\n");
/* Free all NAS PDUs */
for (i = 0; i < ue_context_pP->ue_context.nb_of_pdusessions; i++) {
@@ -1897,6 +1890,13 @@ rrc_gNB_process_RRCConnectionReestablishmentComplete(
PDCP_TRANSMISSION_MODE_CONTROL);
#endif
}
+
+ if (NODE_IS_DU(RC.nrrrc[ctxt_pP->module_id]->node_type) || NODE_IS_MONOLITHIC(RC.nrrrc[ctxt_pP->module_id]->node_type)) {
+ nr_mac_enable_ue_rrc_processing_timer(ctxt_pP->module_id,
+ ue_context_pP->ue_context.rnti,
+ *RC.nrrrc[ctxt_pP->module_id]->carrier.servingcellconfigcommon->ssbSubcarrierSpacing,
+ NR_RRC_RECONFIGURATION_DELAY_MS);
+ }
}
//-----------------------------------------------------------------------------