Laurent THOMAS
2784cd484e
revert default values for 5GS
2021-04-21 10:37:55 +02:00
hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
rmagueta
e8f8297892
Fix search space and coreset for Msg2 and Msg4 at gNB
2021-04-12 19:20:23 +01:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +02:00
Laurent THOMAS
c2257d8687
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-03-30 19:46:45 +02:00
Laurent THOMAS
738728142f
merge develop
2021-03-29 15:33:45 +02:00
hardy
ddf3f9e88c
Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a
2021-03-29 10:02:51 +02:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Thomas Schlichter
14f3d6a77a
gNB: fix memory allocations in fix_scc() and prepare_scd()
...
issues found by valgrind
2021-03-19 11:40:21 +01:00
Thomas Schlichter
dade64ea43
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-19 11:18:02 +01:00
francescomani
f659a76f43
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-03-19 10:06:20 +01:00
francescomani
f0d6298475
new attempt at improving call to RC L1 config
2021-03-19 09:55:18 +01:00
francescomani
a1f1d53cb5
another tentative fix for gnb initialization crashes
2021-03-18 13:09:36 +01:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +01:00
Shweta Shrivastava
a0fa146e04
Merge branch 'ptrs_rrc_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into ptrs_rrc_config
2021-03-10 22:58:06 -06:00
Shweta Shrivastava
7eec3e3bcc
Merge branch 'develop' into ptrs_rrc_config
2021-03-10 22:37:44 -06:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
hardy
90d6a57a3c
Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08
2021-02-23 09:30:22 +01:00
Cedric Roux
73f3a458cf
NSA: finalize nea2 security for gNB
...
- a new section in the configuration file to select security algorithms,
with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
every cases and needs security and bearer parameters
The new section in the configuration file looks like:
security = {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms = ( "nia0" );
};
2021-02-15 15:25:52 +01:00
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +01:00
Thomas Schlichter
d2f353acf6
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-12 15:33:51 +01:00
Mahesh
eb19e02cf3
Merging MR978 with develop
2021-02-11 22:50:25 +05:30
Parminder Singh
9202c583f5
Spaces are corrected, tabs replaced with spaces
2021-02-10 11:10:19 +01:00
dir
d2aa132616
Msg3_transformprecoder value initialised to TRANSFORM PRECODING DISABLED
2021-02-09 15:16:40 +02:00
Thomas Schlichter
14e84f8782
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-09 10:02:54 +01:00
Sakthivel Velumani
8902902706
Merge branch 'develop' into ue-fixes
2021-02-08 15:06:17 +01:00
Parminder Singh
222b37ff13
Merge remote-tracking branch 'origin/develop' into ptrs_rrc_config
2021-02-08 14:16:36 +01:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
Laurent Thomas
fa63d9a4e6
merge develop
2021-02-08 11:56:42 +01:00
Xue Song
6a3b7b40a5
Merge branch 'master' into develop_SA_L3
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
Khodr Saaifan
283a060497
Allow gNB to read pusch_AntennPorts from config file
2021-02-02 09:02:19 +01:00
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
Sakthivel Velumani
c9dcff3d7e
Merge branch 'develop' into ue-fixes
2021-02-01 16:07:58 +01:00
Laurent Thomas
6b37681854
merge develop, minor code addition
2021-02-01 09:02:57 +01:00
Sakthivel Velumani
a241df5006
Fixed compile warnings
2021-01-31 17:35:08 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
Laurent Thomas
954b0f559d
new gtp before tests
2021-01-25 12:59:38 +01:00
He Shanyun
e4ff0d5b31
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2021-01-20 01:51:32 +00:00
Mahesh
185fcbf7fe
Merged latest commit(MR957)
2021-01-15 18:53:02 +05:30
Shweta Shrivastava
1cfb528374
Resolve merge conflicts
2021-01-08 13:21:14 -06:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
Mahesh
024849983a
Merge develop(w51 2) to nfapi_nr
...
Setting of nFAPI mode in NR yet to be updated
2020-12-18 23:26:21 +05:30
Wu.Jing
19118c13d1
Merge branch 'master' into develop_SA_L3
2020-12-18 11:52:59 +09:00
rmagueta
06cb91d795
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-12-10 16:24:28 +00:00
Remi Hardy
3d8be663a0
Merge remote-tracking branch 'origin/NR_FR2_RRC_SSB' into rh_wk50_debug
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-12-09 13:16:41 +01:00