francescomani
72b0fac74a
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-12-08 12:09:52 +01:00
francescomani
b765b02129
Merge remote-tracking branch 'origin/develop' into NR_UE_acknack
2021-12-02 09:23:27 +01:00
francescomani
fa2ce6e680
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-11-26 11:34:22 +01:00
hardy
dc4d243b6c
Merge remote-tracking branch 'origin/develop-aw2sori' into integration_2021_wk47_b
2021-11-24 09:42:56 +01:00
hardy
e8ce9a73ba
Merge remote-tracking branch 'origin/nr_multiple_ue_pucch_resource' into integration_2021_wk46_c
2021-11-19 09:27:47 +01:00
francescomani
2eac9f53c7
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-11-11 16:35:46 +01:00
Mario Joa-Ng
b965cbbb0a
Using rnti to assign different pucch resource to different UE.
2021-11-09 13:24:26 -05: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
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
3963f2fe66
Merge remote-tracking branch 'origin/develop-improve-SA-config' into integration_2021_wk44
2021-10-29 15:26:22 +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
francescomani
b214d1afd1
Merge remote-tracking branch 'origin/develop' into NR_UE_acknack
2021-10-27 13:33:22 +02:00
luis_pereira87
e333a53bdd
Merge branch 'develop' into develop-improve-SA-config
2021-10-27 12:09:46 +01:00
luis_pereira87
68fef91816
Apply the NSA t_Reordering value also for SA
2021-10-26 19:04:03 +01:00
Laurent THOMAS
e3f9fd6b01
code cleanup, no feature
2021-10-24 14:47:24 +02:00
francescomani
2db3e842fd
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-10-22 11:09:51 +02:00
Mario Joa-Ng
d483410e2a
Merge develop.
2021-10-20 21:06:16 -04:00
francescomani
43a831f951
Merge remote-tracking branch 'origin/develop' into NR_UE_acknack
2021-10-20 17:10:24 +02:00
frtabu
c3c02bbd91
Use same port number for source and destination number in new gtp implementation.
2021-10-20 17:09:46 +02:00
frtabu
9707cb9910
rebase on develop
2021-10-20 17:09:46 +02:00
luis_pereira87
545ee44407
Remove unreachable "else" statement
2021-10-11 18:14:45 +01:00
rmagueta
ff34838423
Put back scheduling request configuration after the cherry-pick which solved the segfault
2021-09-30 17:18:00 +01:00
rmagueta
1ab23d4b96
Remove commented functions
2021-09-28 17:25:38 +01:00
Masayuki Harada
f818307143
Remove warning.
2021-09-29 01:20:36 +09:00
rmagueta
5630c434a8
Revert sl10 to 7
2021-09-28 17:13:56 +01:00
Masayuki Harada
7cd75730d3
Remove ifndef PHYSIM conditions.
2021-09-29 01:02:22 +09:00
Masayuki Harada
80831cd48f
Fix nr_derive_key memory problem.
2021-09-29 00:10:48 +09:00
Masayuki Harada
2fb3816722
Fix NRUE NAS security configuration.
2021-09-28 20:26:48 +09:00
francescomani
e946804bbf
Minimum value of DL to ACK
2021-09-27 18:45:59 +02:00
athanassopoulos
86161e475d
Fix: nrUE not processing SDAP header
2021-09-27 18:37:06 +02:00
mjoang
626e3a7015
merge develop
2021-09-23 10:44:43 -04:00
Masayuki Harada
c522caf490
Merge remote-tracking branch 'remotes/oai/develop' into develop-NR_SA_nrUE_security_update
2021-09-18 19:07:17 +09:00
francescomani
9fb094600f
cosmetic changes and duplicate code
2021-09-13 14:54:49 +02:00
francescomani
cfccd8ece8
fix another compilation issue
2021-09-13 10:01:05 +02:00
francescomani
b31199c4ef
make csirs prb occupation generic
2021-09-12 11:27:45 +02:00
francescomani
3c766d29f3
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-09-12 09:38:38 +02:00
Raymond Knopp
37b135b616
logging and DL-CCCH decoding size::
2021-09-11 13:58:08 +02:00
rmagueta
b898981109
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-09-10 10:03:22 +01:00
Masayuki Harada
edd179c263
Merge remote-tracking branch 'remotes/oai/nr-pdcp-security-w34' into develop-NR_SA_nrUE_security_update
2021-09-09 19:40:46 +09:00
rmagueta
71cd100335
Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
rmagueta
722505f22d
Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
...
# Conflicts:
# openair1/PHY/MODULATION/slot_fep_nr.c
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.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_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 17:05:01 +01:00
rmagueta
204bffbc7a
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# executables/nr-uesoftmodem.c
# executables/nr-uesoftmodem.h
# executables/softmodem-common.h
# openair2/LAYER2/NR_MAC_UE/mac_proto.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# 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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 16:31:24 +01:00
Masayuki Harada
d0575640fc
Add calc kgnb and PDCP security settings in nrUE.
2021-09-08 22:52:50 +09:00
francescomani
afdb5728ed
fix for pointa computation in sib1
2021-09-08 14:21:28 +02:00
francescomani
17c0268775
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-09-07 17:17:35 +02:00
francescomani
32bbf94c5d
adding condition to use type 2 only for OAI UE
2021-09-07 16:54:53 +02:00
Eurecom
15c5ea07bc
Merge remote-tracking branch 'origin/develop' into bandwidth-testing
...
Conflicts:
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.h
executables/softmodem-common.h
openair2/LAYER2/NR_MAC_UE/mac_proto.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_uci.c
2021-09-06 11:53:56 +02:00
Cedric Roux
eeca38368e
gnb sa: improve security
...
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.
For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.
Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00
Eurecom
c834f40186
Merge remote-tracking branch 'origin/develop' into bandwidth-testing
...
Conflicts:
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.h
executables/softmodem-common.h
openair1/PHY/MODULATION/slot_fep_nr.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SIMULATION/TOOLS/abstraction.c
openair1/SIMULATION/TOOLS/random_channel.c
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
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
2021-09-05 15:37:11 +02:00