rmagueta
e0833b74d8
Fix warning after merge
2021-04-30 18:25:19 +01:00
rmagueta
655c5481e3
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# executables/nr-uesoftmodem.h
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
rmagueta
916daed3a9
Fix DL after CFRA
2021-04-30 17:03:21 +01:00
Laurent THOMAS
04b28b4518
fixes from testing
2021-04-30 16:47:40 +02:00
rmagueta
fece683445
Fix issues after merge
2021-04-30 12:14:37 +01:00
rmagueta
cb0bb5f8b9
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-30 11:12:15 +01:00
rmagueta
0bd675b364
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-29 22:59:36 +01:00
rmagueta
3c0aadfd23
Fix warnings
2021-04-29 22:58:14 +01:00
rmagueta
770b864fb3
Fix segmentation fault after CFRA
2021-04-29 20:07:17 +01:00
Laurent THOMAS
8383843e9b
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-04-29 19:06:47 +02:00
Laurent THOMAS
9643a5fb9b
memory mgmt error
2021-04-29 19:06:10 +02:00
rmagueta
8a5319fc61
Fix tda and nr_schedule_ue_spec after merge
2021-04-29 16:25:05 +01:00
Raymond Knopp
a9603c8a48
Include second RRC Reconfiguration message to carry DRB, SRB2 configuration and NAS PDU Session Establishment Accept message
...
-Remove DRB and SRB configuration from the first RRC Reconfiguration message. Missing radio configuration to be filled in first RRC Reconfiguration message.
2021-04-29 16:44:10 +02:00
Cedric Roux
d2c9b7cb5a
nr pdcp: bugfix: reset integrity context
...
CMAC_Init has to be called between each usage of the cmac context.
2021-04-29 15:15:18 +02:00
Raymond Knopp
3caa78ea9a
adding band info to UE capabilty enquiry
2021-04-29 15:06:47 +02:00
Raymond Knopp
439ceafa62
applied extra MAC config IE to RRCSetup
2021-04-29 10:39:18 +02:00
Raymond Knopp
970ccd55f0
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-04-29 07:37:28 +02:00
Raymond Knopp
048f98f7a0
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2021-04-29 07:37:09 +02:00
rmagueta
7a07d57ac9
Fix segmentation fault after merge
2021-04-28 20:02:12 +01:00
rmagueta
537d81058f
Fix uplink for NR_UL_DCI_FORMAT_0_0 after merge
2021-04-28 19:51:06 +01:00
luis_pereira87
bc725e116c
Fix dmrs_idx for coreset with duration > 1 symbol
2021-04-28 16:18:03 +01:00
rmagueta
d5a7e6ad7e
Fix segmentations fault after merge
2021-04-28 14:22:23 +01:00
rmagueta
43b7c16e83
Fix RA after merge
2021-04-28 00:17:25 +01:00
rmagueta
72b5fccce3
Fix build issues after merge
2021-04-27 18:44:39 +01:00
rmagueta
0a3f128e27
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
Cedric Roux
3633bcd367
nr pdcp: bugfixes
...
- use bearer-1 in compute_t of integrity NIA2
- compare integrity at the right place in nr_pdcp_entity_recv_pdu
- proper handling of security parameters settings (algos, keys)
2021-04-27 14:46:42 +02:00
rmagueta
278bfa8d6a
Revert "Call the right function for the initiation of gtp-u task at gNB"
...
This reverts commit 19ba8dd7
2021-04-27 13:05:35 +01:00
rmagueta
edb790ab04
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-27 12:36:31 +01:00
rmagueta
987455b9e6
Fix warnings after merge
2021-04-27 12:35:35 +01:00
matzakos
19ba8dd7a9
Call the right function for the initiation of gtp-u task at gNB
2021-04-27 13:31:41 +02:00
matzakos
52f8506b5c
Include PDU session type field in PDU Session Establishment Request NAS message
2021-04-27 13:30:02 +02:00
matzakos
9f0c10617a
Include rlc bearer configuration list for the configuration of RLC and PDCP RBs
2021-04-27 13:28:59 +02:00
matzakos
ee3b913864
Small correction in NGAP UERadioCapabilityInfoIndication message
2021-04-27 13:28:03 +02:00
matzakos
20653cd31b
Modify configuration of NGAP and NAS messages to comply with OAI CN configuration according to Fujitsu patch
...
-Hardcodings to be removed later when the NAS extensions will be integrated for OAI UE
2021-04-27 13:26:06 +02:00
rmagueta
9372be0466
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-27 12:12:59 +01:00
rmagueta
e8d48e5cc1
Minor improvements for RA at gNB
2021-04-27 12:10:27 +01:00
Raymond Knopp
fe737d4c29
minor changes
2021-04-27 11:50:30 +02:00
Cedric Roux
a8adcf862c
sa: nr pdcp: we don't use the hash table anymore
2021-04-27 10:00:24 +02:00
Remi Hardy
d953b25353
Integration 2021 wk17 a
...
MR !1079 / MR !1108 :
1. Read slots from config file and schedules all slots *except* for slots 0 and 10. This is not a problem, since currently we cannot allocate more than six HARQ feedbacks in a slot, but we might have up to 7 with current configuration
2. phytest mode is configurable. From `nr-softmodem -h`:
-m: Set the downlink MCS for PHYTEST mode
-t: Set the uplink MCS for PHYTEST mode
-M: Set the downlink banwdwidth (in PRBs) for PHYTEST mode
-T: Set the uplink banwdwidth (in PRBs) for PHYTEST mode
-D: Bitmap for DLSCH slots (slot 0 starts at LSB)
-U: Bitmap for ULSCH slots (slot 0 starts at LSB)
3. Scheduler prints more information: UE PHR, PUCCH SNR, PUSCH SNR, RSSI
4. The scheduler learned to scheduler DLSCH/ULSCH in mixed slots (if the time domain allocation matches the mixed slot)
5. The scheduler expects
* PDSCH Time Domain allocation index 0 to be the DL slot allocation
* PDSCH TDA index 1 for Mixed DL slot
* PUSCH TDA index 0 for UL slot
* PUSCH TDA index 1 for Mixed UL slot
* PUSCH TDA index 2 for Msg.3
6. Some more cleanup, e.g., separate PDSCH/PUSCH data structures into "semi-static" data (e.g., TDA allocation to use, since it changes seldomly) and "dynamic" data (e.g., RB allocation per slot, which changes every slot)
MR !1137 : Benetel config files fix
2021-04-27 06:16:06 +00:00
rmagueta
5aa999337a
Minor corrections after merge
2021-04-26 15:44:50 +01:00
rmagueta
e1ef4e2d3b
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/GNB_APP/L1_nr_paramdef.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-26 15:11:00 +01:00
Raymond Knopp
458f199dce
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-04-26 12:06:43 +02:00
Raymond Knopp
a304c87659
resolved a missing conflict after merge with develop
2021-04-26 12:06:03 +02:00
Cedric Roux
9135d4200f
sa: nr pdcp: improve security
...
This commit implements integrity and security settings for nr pdcp. It will
only work for SRBs.
This commit has not been tested. It may fail to work completely. To be checked.
2021-04-26 11:43:44 +02:00
Raymond Knopp
2be602e938
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
2021-04-26 10:51:18 +02:00
hardy
e2ab8bc54b
Merge remote-tracking branch 'origin/benetel_config_file_fix' into integration_2021_wk17_a
2021-04-26 10:21:05 +02:00
Raymond Knopp
f916590e58
put NIA2 as default integrity algorithm
2021-04-26 10:15:43 +02:00
Raymond Knopp
10ea3b674e
reduced logging, added PUSCH DTX threshold and counter. Improved n1L1_stats.log.
2021-04-25 22:36:14 +02:00
rmagueta
63663ac4b2
Fix warning after merge
2021-04-25 19:39:59 +01:00
rmagueta
146369015f
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-04-25 18:44:17 +01:00