maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-NR_SA_F1AP_5GRECORDS

Browse Source
This commit is contained in:
francescomani
2021-05-06 09:34:44 +02:00
parent a8308db7bc 055f147d13
commit 6222463fd8
7 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/config_ue.c
+1 -1
View File
@@ -717,7 +717,7 @@ int nr_rrc_mac_config_req_ue(
mac->common_configuration_complete = 1;
}
if(scell_group_config != NULL ){
mac->cg = cell_group_config;
mac->cg = scell_group_config;
mac->servCellIndex = *scell_group_config->spCellConfig->servCellIndex;
config_control_ue(mac);
if (scell_group_config->spCellConfig->reconfigurationWithSync) {
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+4 -2
View File
@@ -87,8 +87,10 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
} else {
LOG_I(MAC,"Running without CellGroupConfig\n");
nr_rrc_mac_config_req_ue(0,0,0,NULL,NULL,NULL,NULL);
AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
}
if(get_softmodem_params()->sa == 1) {
AssertFatal(rlc_module_init(0) == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);
}
}
return (nr_ue_mac_inst);
}