Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3

# Conflicts: # common/utils/ocp_itti/intertask_interface.h # openair2/RRC/NR/rrc_gNB.c # openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-27 20:25:16 +09:00
parent 4649f0f615 b67badef1b
commit 1956fd3b72
3 changed files with 6 additions and 10 deletions
@@ -260,6 +260,7 @@ typedef struct IttiMsgText_s {
 #include <openair3/GTPV1-U/gtpv1u_gNB_task.h>
 void *rrc_enb_process_itti_msg(void *);
 #include <openair3/SCTP/sctp_eNB_task.h>
+#include <openair3/S1AP/s1ap_eNB.h>
 #include <openair3/NGAP/ngap_gNB.h>

 #ifdef ITTI_SIM