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

Merge remote-tracking branch 'origin/episys/mel/merge_develop_cfra_working' into episys/mel/merge_develop_cfra_working_for_multiUE

Browse Source 
Resolved merge conflict.
This commit is contained in:
David Kim
2021-08-31 17:45:26 -07:00
parent 86d605eea1 bfa8c8355c
commit ea63a9eeb0
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-uesoftmodem.c
+9 -9
View File
@@ -397,17 +397,17 @@ void init_pdcp(int ue_id) {
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
}*/
if (IS_SOFTMODEM_NOKRNMOD)
if (IS_SOFTMODEM_NOKRNMOD) {
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
if(!IS_SOFTMODEM_NOS1) {
if (rlc_module_init(0) != 0) {
LOG_I(RLC, "Problem at RLC initiation \n");
}
}
pdcp_layer_init();
nr_pdcp_module_init(pdcp_initmask, ue_id);
//nr_DRB_preconfiguration();
//pdcp_module_init(pdcp_initmask, 0);
if (rlc_module_init(0) != 0) {
LOG_I(RLC, "Problem at RLC initiation \n");
}
if(!IS_SOFTMODEM_NOS1) {
pdcp_layer_init();
nr_pdcp_module_init(pdcp_initmask, ue_id);
}
pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
}