Merge branch 'develop_SA_SIM' into develop_SA_L3

Conflicts: openair2/RRC/NR/nr_rrc_proto.h openair2/RRC/NR/rrc_gNB.c openair2/RRC/NR_UE/rrc_UE.c openair2/RRC/NR_UE/rrc_defs.h openair3/NGAP/ngap_gNB_nas_procedures.c
2020-12-18 17:38:07 +09:00
parent 19118c13d1 a53d6795c8
commit 37d52bdf60
22 changed files with 1907 additions and 292 deletions
@@ -48,6 +48,7 @@ typedef enum {
  MSC_MAC_ENB,
  MSC_RLC_ENB,
  MSC_PDCP_ENB,
+  MSC_PDCP_GNB,
  MSC_RRC_ENB,
  MSC_RRC_GNB,
  MSC_IP_ENB,