Merge branch 'develop_SA_RRC' into develop_SA_SIM
Conflicts: common/utils/ocp_itti/intertask_interface.h openair2/RRC/NR/rrc_gNB.c openair2/RRC/NR/rrc_gNB_NGAP.c openair2/RRC/NR_UE/rrc_UE.c openair2/RRC/NR_UE/rrc_defs.h openair3/NGAP/ngap_gNB_nas_procedures.c
This commit is contained in:
@@ -221,7 +221,7 @@ int ngap_gNB_handle_nas_first_req(
|
||||
|
||||
ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
|
||||
|
||||
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
|
||||
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
|
||||
CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
|
||||
userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user