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

Updating pdcp init functions to maintain SA behavior

Browse Source
This commit is contained in:
Melissa Elkadi
2021-10-13 06:52:15 -07:00
parent 4c5a693a14
commit 28391dad6a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1 -1
View File
@@ -1288,7 +1288,7 @@ pdcp_run (
// IP/NAS -> PDCP traffic : TX, read the pkt from the upper layer buffer // IP/NAS -> PDCP traffic : TX, read the pkt from the upper layer buffer
// if (LINK_ENB_PDCP_TO_GTPV1U && ctxt_pP->enb_flag == ENB_FLAG_NO) { // if (LINK_ENB_PDCP_TO_GTPV1U && ctxt_pP->enb_flag == ENB_FLAG_NO) {
if (!get_softmodem_params()->nsa) { if (!get_softmodem_params()->nsa && (!EPC_MODE_ENABLED || ctxt_pP->enb_flag == ENB_FLAG_NO)) {
pdcp_fifo_read_input_sdus(ctxt_pP); pdcp_fifo_read_input_sdus(ctxt_pP);
} }
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+11 -3
View File
@@ -416,13 +416,21 @@ uint64_t nr_pdcp_module_init(uint64_t _pdcp_optmask, int id)
int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1; int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1;
netlink_init_tun("nrue", num_if, id); netlink_init_tun("nrue", num_if, id);
//Add --nr-ip-over-lte option check for next line //Add --nr-ip-over-lte option check for next line
if (IS_SOFTMODEM_NOS1) if (IS_SOFTMODEM_NOS1 && get_softmodem_params()->nsa)
nas_config(1, 1, 3, "nrue"); nas_config(1, 1, 3, "nrue");
else if (IS_SOFTMODEM_NOS1)
nas_config(1, 1, 2, "ue");
LOG_I(PDCP, "UE pdcp will use tun interface\n"); LOG_I(PDCP, "UE pdcp will use tun interface\n");
start_pdcp_tun_ue(); start_pdcp_tun_ue();
} else if(ENB_NAS_USE_TUN) { } else if(ENB_NAS_USE_TUN) {
netlink_init_tun("gnb", 1, id); if (get_softmodem_params()->nsa) {
nas_config(1, 1, 1, "gnb"); netlink_init_tun("gnb", 1, id);
nas_config(1, 1, 1, "gnb");
}
else {
netlink_init_tun("enb", 1, id);
nas_config(1, 1, 1, "enb");
}
LOG_I(PDCP, "ENB pdcp will use tun interface\n"); LOG_I(PDCP, "ENB pdcp will use tun interface\n");
start_pdcp_tun_enb(); start_pdcp_tun_enb();
} else { } else {
targets/RT/USER/lte-softmodem.c
+2
View File
@@ -751,6 +751,8 @@ int main ( int argc, char **argv )
create_tasks_mbms(1); create_tasks_mbms(1);
config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS); config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS);
} }
else
create_tasks_mbms(1);
//create_tasks_mbms(1); //create_tasks_mbms(1);
// wait for end of program // wait for end of program