maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,537 Commits 5 Branches 0 Tags
be31d514b4802e82494a22d544e2787554aa04cf
Commit Graph
321 Commits
Author SHA1 Message Date
masayuki.harada be31d514b4 Fix warning and compile error. 2020-11-17 22:09:41 +09:00
masayuki.harada e3d3c6e418 Merge branch 'NR_SA_NGAP_RRC_wk42' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_NGAP_RRC_wk42 2020-11-16 13:59:33 +09:00
zhenghuangkun@cn.fujitsu.com f64bba177a Modify SA source code 2020-11-13 07:37:22 +00:00
matzakos 7772a51c07 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	targets/COMMON/create_nr_tasks.c
 2020-11-09 15:52:52 +01:00
Laurent 7d603191db merge develop 2020-10-29 16:29:32 +01:00
Laurent 136d9ccb67 add documentation and code review comments 2020-10-29 16:14:55 +01:00
matzakos 87c83aaf21 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42 
Conflicts:
	cmake_targets/CMakeLists.txt
	docker/Dockerfile.enb.rhel7.oc4-4
	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
 2020-10-29 00:19:49 +01:00
masayuki.harada 483f4b2d1b Fix merge miss. 2020-10-28 04:21:41 +09:00
masayuki.harada dc288b7bc8 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42 
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-28 03:57:14 +09:00
masayuki.harada 1956fd3b72 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
Laurent 7ec149cc35 merge develop 2020-10-27 08:23:59 +01:00
He Shanyun b67badef1b fix build error of phy simulator 2020-10-27 02:59:52 +00:00
Wu.Jing 66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing 08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
masayuki.harada 1ce1e8f82b Merge branch 'oai_develop' 
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
 2020-10-26 15:03:58 +09:00
Xue Song d5f95c6c79 fix some error 2020-10-23 08:00:21 +00:00
Xue Song ce85677762 modify some issues 2020-10-23 03:42:06 +00:00
hardy 0a8bc5cdb5 Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into integration_2020_wk42_2 2020-10-22 16:23:05 +02:00
masayuki.harada a21ba6c7dc Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_NGAP_RRC_wk42 2020-10-22 19:59:13 +09:00
zhanghuiqin f3c922b1c1 fix RRCReject 2020-10-22 09:19:27 +00:00
Francesco Mani 76abeaf30e Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-22 09:26:51 +02:00
He Shanyun 028be9e486 fix build error of phy simulator 2020-10-22 05:55:51 +00:00
Laurent 5c69510f17 merge develop, improve doc 2020-10-21 14:38:17 +02:00
masayuki.harada a6a39d9951 Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-21 16:41:09 +09:00
yaojie bfd2c35c35 fix warning/error 2020-10-21 07:30:20 +00:00
Xue Song 592642cb28 modify RRC messages 2020-10-21 02:46:40 +00:00
zhanghuiqin fad30fff8a fix UECapabilityEnquiry & UECapabilityInformation 2020-10-20 08:41:41 +00:00
Xue Song 4766f3a629 fix RRCReconfiguration/RRCReconfigurationComplete 2020-10-19 07:58:10 +00:00
yaojie 6030a75a65 fix securityModeCommand/securityModeComplete 2020-10-16 09:15:53 +00:00
Xue Song dfa50d975b Modify RRCSetupComplete 2020-10-16 08:42:28 +00:00
Xue Song 5697057f0b Unblock ITTI SIM process 2020-10-16 05:06:19 +00:00
Qiu DeZhi 46bbb6a943 Modify RRCSetupComplete 2020-10-15 10:34:19 +00:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
masayuki.harada af35e37c74 Merge branch 'oai_develop' 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
 2020-10-15 15:25:04 +09:00
He Shanyun e6ddb5379c add process for itti simulator 2020-10-14 03:22:55 +00:00
Xue Song 878b483746 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 11:37:45 +00:00
Xue Song 9812545c61 modify rrc_gNB_generate_RRCSetup 2020-10-13 11:36:52 +00:00
Xue Song 38516da2dc Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 10:48:46 +00:00
Xue Song 0f378cf3da modify RRCSetup 2020-10-13 10:48:01 +00:00
Xue Song db410e41a6 Merge branch 'develop_SA_RRC' into develop_SA_SIM 2020-10-13 09:31:16 +00:00
Xue Song 8c421698c4 modify do_RRCSetup 2020-10-13 09:07:19 +00:00
Francesco Mani b7d71d58ad Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into NR_CSI_reporting 2020-10-12 17:14:55 +02:00
Xue Song f4f8db4373 Merge branch 'develop_SA_RRC' into develop_SA_SIM 
Modify RRCReconfiguration
 2020-10-12 04:59:49 +00:00
Xue Song 994229963b Modify RRCReconfiguration 2020-10-12 02:59:22 +00:00
Wu.Jing ac6262e82b fix gNB build error 2020-10-10 06:57:57 +00:00
yaojie 3b6f720125 RM3977 2020-10-10 06:25:29 +00:00
Xue Song fefb6148e6 Modify some warnings 
Add nr_rrc_pdcp_config_security
Delete ENABLE_SECURITY
 2020-10-10 06:18:40 +00:00
zhenghuangkun 84579c5dc0 Modify MME_MODE_ENABLED to AMF_MODE_ENABLED 
Modify kenb to kgnb
Modify some warnings
 2020-10-10 06:16:49 +00:00
Xue Song aa8e695d59 Fix compiling error 2020-10-10 03:24:06 +00:00
yaojie 457423fe25 RM3977 2020-10-09 08:03:48 +00:00