Skip to content

O
OpenXG-RAN
Commit 8cff73dc authored by masayuki.harada's avatar masayuki.harada
Browse files
Options

Fix merge error.

parent 5c49c67f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
cmake_targets/CMakeLists.txt
View file @ 8cff73dc
...@@ -3465,6 +3465,7 @@ add_executable(nr-ittisim ...@@ -3465,6 +3465,7 @@ add_executable(nr-ittisim
${OPENAIR_DIR}/common/utils/utils.c ${OPENAIR_DIR}/common/utils/utils.c
${OPENAIR_DIR}/common/utils/system.c ${OPENAIR_DIR}/common/utils/system.c
${OPENAIR_DIR}/common/utils/nr/nr_common.c ${OPENAIR_DIR}/common/utils/nr/nr_common.c
${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
${GTPU_need_ITTI} ${GTPU_need_ITTI}
${XFORMSINTERFACE_SOURCE} ${XFORMSINTERFACE_SOURCE}
${T_SOURCE} ${T_SOURCE}
......
openair2/RRC/NR_UE/rrc_defs.h
View file @ 8cff73dc
...@@ -129,11 +129,6 @@ typedef struct NR_UE_RRC_INST_s { ...@@ -129,11 +129,6 @@ typedef struct NR_UE_RRC_INST_s {
NR_CipheringAlgorithm_t cipheringAlgorithm; NR_CipheringAlgorithm_t cipheringAlgorithm;
e_NR_IntegrityProtAlgorithm integrityProtAlgorithm; e_NR_IntegrityProtAlgorithm integrityProtAlgorithm;
/* Used integrity/ciphering algorithms */
//RRC_LIST_TYPE(NR_SecurityAlgorithmConfig_t, NR_SecurityAlgorithmConfig) SecurityAlgorithmConfig_list;
NR_CipheringAlgorithm_t cipheringAlgorithm;
e_NR_IntegrityProtAlgorithm integrityProtAlgorithm;
// lists // lists
// CellGroupConfig.rlc-BearerToAddModList // CellGroupConfig.rlc-BearerToAddModList
RRC_LIST_TYPE(NR_RLC_BearerConfig_t, NR_maxLC_ID) RLC_Bearer_Config_list; RRC_LIST_TYPE(NR_RLC_BearerConfig_t, NR_maxLC_ID) RLC_Bearer_Config_list;
......
openair3/NGAP/ngap_gNB_nas_procedures.c
View file @ 8cff73dc
...@@ -225,11 +225,7 @@ int ngap_gNB_handle_nas_first_req( ...@@ -225,11 +225,7 @@ int ngap_gNB_handle_nas_first_req(
ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR; ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
<<<<<<< HEAD
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
=======
ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
>>>>>>> b67badef1b2fd390d801e20644b08df0d5880583
CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR)); CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR; userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;
......
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