diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c index b2a45315d6..53d7689b62 100644 --- a/openair2/LAYER2/NR_MAC_UE/config_ue.c +++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c @@ -724,9 +724,9 @@ void nr_configure_mac_config_logicalChannelBearer(module_id_t module_id, mac->scheduling_info.lc_sched_info[channel_identity - 1].LCGID = 0; } -void nr_rrc_mac_config_req_ue_logicalChannelBearer(module_id_t module_id, - struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_toadd_list, - struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_torelease_list) +static void configure_logicalChannelBearer(module_id_t module_id, + struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_toadd_list, + struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_torelease_list) { NR_UE_MAC_INST_t *mac = get_mac_inst(module_id); if (rlc_torelease_list) { @@ -1956,6 +1956,10 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id, } } + configure_logicalChannelBearer(module_id, + cell_group_config->rlc_BearerToAddModList, + cell_group_config->rlc_BearerToReleaseList); + // Setup the SSB to Rach Occasions mapping according to the config // Only if RACH is configured for current BWP if (mac->current_UL_BWP->rach_ConfigCommon) diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h index ca0fac4908..d36a9750e7 100644 --- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h @@ -177,10 +177,6 @@ void release_dl_BWP(NR_UE_MAC_INST_t *mac, int index); void release_ul_BWP(NR_UE_MAC_INST_t *mac, int index); void nr_release_mac_config_logicalChannelBearer(NR_UE_MAC_INST_t *mac, long channel_identity); -void nr_rrc_mac_config_req_ue_logicalChannelBearer(module_id_t module_id, - struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_toadd_list, - struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_torelease_list); - void nr_rrc_mac_config_req_cg(module_id_t module_id, int cc_idP, NR_CellGroupConfig_t *cell_group_config); diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c index 08bc17e89f..d775931bdd 100644 --- a/openair2/RRC/NR_UE/rrc_UE.c +++ b/openair2/RRC/NR_UE/rrc_UE.c @@ -745,9 +745,6 @@ static void nr_rrc_manage_rlc_bearers(const NR_UE_RRC_INST_t *rrc, } } } - nr_rrc_mac_config_req_ue_logicalChannelBearer(rrc->ue_id, - cellGroupConfig->rlc_BearerToAddModList, - cellGroupConfig->rlc_BearerToReleaseList); } void nr_rrc_cellgroup_configuration(rrcPerNB_t *rrcNB, NR_UE_RRC_INST_t *rrc, NR_CellGroupConfig_t *cellGroupConfig)