Commit Graph
7179 Commits
Author SHA1 Message Date
matzakos e8d92cbddd Merge remote-tracking branch 'origin/NR_F1C_F1U_extensions' into F1C_extensions_develop 2021-11-19 16:47:47 +01:00
Laurent THOMAS a38e368be2 fix gtp-u address between NSA and SA modes 2021-11-16 22:03:27 +01:00
Laurent THOMAS 66073d50fc merge develop 2021-11-15 10:25:52 +01:00
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-11-14 21:18:50 +01:00
Raymond Knopp 3d454a45a3 allow max_ul_frame_inactivity=0. This means 1/2 frame. 2021-11-14 20:09:21 +01:00
Raymond Knopp c2fbcbcabc Merge branch 'bler_txoptim' of https://gitlab.eurecom.fr/oai/openairinterface5g into bler_txoptim 2021-11-14 17:28:56 +01:00
Raymond Knopp 02b17c79d6 commit before merge. minor changes for testing 2021-11-14 17:28:24 +01:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
matzakos c8f76a2469 Increase size of RRC container carrying cellGroupConfig info for F1 initial UL RRC message transfer
-Fixing issue with decoding cellGroupConfig later
2021-11-12 15:29:44 +01:00
hardy 032ec1cdad Merge remote-tracking branch 'origin/NR_MCS_BLER' into integration_2021_wk45_c 2021-11-10 20:44:32 +01:00
matzakos 188a99ca51 Temporary dirty fix to not block SRB1 traffic once SRB2 is added
-This function will change completely after update with develop
2021-11-10 18:35:52 +01:00
matzakos cd16d7ce03 Make the call to send DCCH SDU to RLC from RRC instead of F1AP 2021-11-10 18:35:05 +01:00
matzakos f1455f15a3 Check whether RRC Setup is available before sending CBRA Msg4
-Required for the CU/DU split case if the RRC Setup arrives later than the first opportunity to transmit Msg4
-Next extension is to decouple RRCSetup from Msg4
2021-11-10 18:33:48 +01:00
matzakos 6a1ac14447 Include mandatory transaction ID field in F1 initial UL RRC message transfer 2021-11-10 18:31:08 +01:00
rmagueta 70d3c7973c Merge remote-tracking branch 'origin/develop' into bler_txoptim 2021-11-09 10:39:49 +00:00
hardy 4b9f7ec404 Merge remote-tracking branch 'origin/ci-test-newstats' into integration_2021_wk45_c 2021-11-09 10:19:10 +01:00
hardy 88fd5df1f0 Merge remote-tracking branch 'origin/nr_multiple_ue' into integration_2021_wk45_b 2021-11-08 13:13:56 +01:00
hardy cf41f0ccda Merge remote-tracking branch 'origin/NR_debug_sib1_reception' into integration_2021_wk45_b 2021-11-08 13:13:35 +01:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
hardy 9c1336157e Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b 2021-11-08 13:12:28 +01:00
matzakos 24cd2887d2 Change size parameter in encoding function for initial cellgroupconfig 2021-11-05 11:20:44 +01:00
matzakos e2b4f80ac2 Add sNSSAI configuration in F1 Setup request message to the CU
-Required for interoperability with Accelleran CU and OAI CN
-Currently hardcoded values, to be modified so that they are parsed from the DU config file
-After this modification Accelleran CU sends gNBCU configuration update
2021-11-05 10:38:46 +01:00
hardy 60a91cc207 Merge remote-tracking branch 'origin/NR_MAC_statisticsthread' into ci-test-newstats 2021-11-04 17:00:34 +01:00
Laurent THOMAS 9d1fe78e2e merge develop, no working yet 2021-11-04 12:53:01 +01:00
luis_pereira87 29eca46833 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
2021-11-04 11:32:03 +00:00
Sakthivel Velumani 3799aeb86b Merge branch 'develop' into NR_MAC_statisticsthread 2021-11-04 15:54:37 +05:30
Laurent THOMAS d49165f07a merge develop 2021-11-03 17:28:06 +01:00
Mario Joa-Ng b64f9f379f fix bug in GNB MAC nr_store_dlsch_buffer() to handle multipe UEs correctly. 2021-11-03 11:34:47 -04:00
francescomani 59195807cc Merge remote-tracking branch 'origin/develop' into NR_MCS_BLER 2021-11-03 14:03:01 +01:00
francescomani d55158eb14 temporarily remove conditions on 2nd and 3rd rtx and increase max mcs to 28 2021-11-03 14:01:17 +01:00
hardy cc18013320 Merge remote-tracking branch 'origin/NR_cset_bwp_fixes' into integration_2021_wk44 2021-11-03 13:38:55 +01:00
hardy cb9defc629 Merge remote-tracking branch 'origin/develop-NR_SA_nrUE_security_update' into integration_2021_wk44 2021-11-03 13:38:33 +01:00
hardy cd28e3fbd7 Merge remote-tracking branch 'origin/crash-gcc-O0' into integration_2021_wk44 2021-11-03 13:38:10 +01:00
luis_pereira87 12e8818bed Remove duplicate validation 2021-11-02 17:49:52 +00:00
luis_pereira87 cd2f704163 Fix segmentation fault when exporting packets to wireshark with high MCS 2021-11-02 17:24:10 +00:00
Raymond Knopp 1263074f59 log removal 2021-11-01 23:16:01 +01:00
Raymond Knopp b58a8c6241 Merge remote-tracking branch 'origin/tx-proc-optim' into bler_txoptim 2021-11-01 21:19:23 +01:00
Raymond Knopp 5a25fdc681 Merge branch 'NR_MCS_BLER' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_MCS_BLER
Conflicts:
	ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
2021-11-01 21:18:42 +01:00
Raymond Knopp 64e610361f merge from Laurent's TX-optimization-lts (cherry-picked dlsch_encoding component) 2021-10-31 22:43:20 +01:00
Raymond Knopp 2f30123fc2 testing up to mcs 28 2021-10-31 07:44:25 +01:00
francescomani 3c39f09df8 Merge remote-tracking branch 'origin/develop' into NR_MCS_BLER 2021-10-29 18:39:41 +02:00
hardy 3963f2fe66 Merge remote-tracking branch 'origin/develop-improve-SA-config' into integration_2021_wk44 2021-10-29 15:26:22 +02:00
Laurent THOMAS 2d3bfb9b67 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into crash-gcc-O0 2021-10-28 11:03:42 +02:00
hardy af7d9cd920 Merge remote-tracking branch 'origin/nr_sdap_gnb' into integration_2021_wk44 2021-10-27 15:07:53 +02:00
hardy de801af6c1 Merge remote-tracking branch 'origin/nr_ue_mac_pdu_fixes_sr_bsr' into integration_2021_wk44 2021-10-27 14:51:49 +02:00
hardy 604e6e063e Merge remote-tracking branch 'origin/NR_BWP_fixes' into integration_2021_wk44 2021-10-27 14:48:58 +02:00
francescomani 4d21ec23df Merge remote-tracking branch 'origin/develop' into NR_SA_band_96 2021-10-27 14:21:02 +02:00
francescomani d4c4f092b4 Merge remote-tracking branch 'origin/develop' into NR_cset_bwp_fixes 2021-10-27 14:06:25 +02:00
luis_pereira87 e333a53bdd Merge branch 'develop' into develop-improve-SA-config 2021-10-27 12:09:46 +01:00
Raymond Knopp a8bfa8ea5a MAC statistics in separate thread 2021-10-26 20:05:46 +02:00