Commit 09e1b98f authored by Melissa's avatar Melissa

Merge branch 'episys/david/sctp_update' into 'episys/master-nsa'

Adding NSA mode for calling rlc_module_init  and SCTP_TASK

See merge request aburger/openairinterface5g!72
parents d1787a60 a30e27cb
...@@ -397,7 +397,7 @@ void init_pdcp(int ue_id) { ...@@ -397,7 +397,7 @@ void init_pdcp(int ue_id) {
if (IS_SOFTMODEM_NOKRNMOD) { if (IS_SOFTMODEM_NOKRNMOD) {
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
} }
if (rlc_module_init(0) != 0) { if (get_softmodem_params()->nsa && rlc_module_init(0) != 0) {
LOG_I(RLC, "Problem at RLC initiation \n"); LOG_I(RLC, "Problem at RLC initiation \n");
} }
pdcp_layer_init(); pdcp_layer_init();
......
...@@ -61,9 +61,10 @@ int create_tasks(uint32_t enb_nb) { ...@@ -61,9 +61,10 @@ int create_tasks(uint32_t enb_nb) {
rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL); rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
AssertFatal(rc >= 0, "Create task for RRC eNB failed\n"); AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");
rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL); if (get_softmodem_params()->nsa || (EPC_MODE_ENABLED && split73 != SPLIT73_DU)) {
AssertFatal(rc >= 0, "Create task for SCTP failed\n"); rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for SCTP failed\n");
}
if (EPC_MODE_ENABLED && !NODE_IS_DU(type) && ! ( split73==SPLIT73_DU ) ) { if (EPC_MODE_ENABLED && !NODE_IS_DU(type) && ! ( split73==SPLIT73_DU ) ) {
rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL); rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment