rmagueta
feb2651ea7
Fix issues due to merge
2021-03-30 12:38:31 +01:00
rmagueta
b55b11b125
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
rmagueta
b43c054f02
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# 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-03-29 15:51:37 +01: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
hardy
a84b1b4340
Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b
2021-03-28 21:36:45 +02:00
rmagueta
d37552db4c
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00: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
rmagueta
9456542678
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
rmagueta
986a9fac1d
Fixed issues to allow coexistence of CFRA and CBRA implementations
2021-03-16 16:00:37 +00:00
hardy
9abc8a6425
Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11
2021-03-16 16:28:31 +01:00
hardy
dc60f04a46
Merge remote-tracking branch 'origin/NR_MAC_TCI_UCI_GlobalEdge' into integration_2021_wk11
2021-03-16 16:26:41 +01:00
Thomas Schlichter
8768deaf74
Merge remote-tracking branch 'develop' into ptrs_rrc_config
2021-03-16 14:01:32 +01:00
rmagueta
8646dd0bcb
DRB configuration for a new crnti
2021-03-16 12:51:04 +00:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +01:00
hardy
ee398c7610
solved merge conflicts related to CI scripts
2021-03-16 11:55:23 +01:00
luis_pereira87
bdc97f7a56
Send MAC NR-BCCH-SL-SCH to RRC through ITTI at UE
2021-03-16 10:08:54 +00:00
francescomani
5eb86207db
Merge remote-tracking branch 'origin/develop' into NR_MAC_TCI_UCI_GlobalEdge
2021-03-16 08:49:54 +01:00
Robert Schmidt
8307d79929
Make RRC buffer sufficiently large
2021-03-15 15:00:34 +01:00
guhan
92c9d80ce0
Reverted the changes as same as develop
2021-03-15 17:47:04 +05:30
hardy
ca3aaf700f
Merge remote-tracking branch 'origin/fix-nr-pdcp-timer' into integration_2021_wk11
2021-03-15 09:31:40 +01:00
Remi Hardy
de9c8634ad
Merge remote-tracking branch 'origin/s1_subnormal' into integration_2021_wk10
2021-03-12 11:08:09 +01:00
Shweta Shrivastava
95df7843f3
Fix issues with NSA mode
2021-03-11 00:11:16 -06: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
Cedric Roux
4ff8f8832e
NR: fix: set PDCP discard timer to infinity
...
The discard timer is used by the PDCP layer to discard packets that were not
transmitted to RLC after some time.
We don't really need it for the moment, maybe never for the default
bearer which is a best-effort bearer passing all kind of IP traffic.
Maybe for voice over IP kind of traffic it's important, or realtime
applications.
I ran an iperf UDP uplink test and saw no error on the PHY layer but still
lots of packets lost in the iperf logs, which was very surprising. By
analyzing the logs in wireshark I saw that, with the current scheduler,
an IP packet sent by the UE took 40ms to be sent piece by piece to the
gNB, and then the next uplink IP packet was never sent at all because
the discard timer was expired, leading to the high count of packets lost
in the iperf logs.
So let's put infinity for the moment for the discard timer. From my
understanding of the moment it's not a problem. If for some reason we
should set it to some non-infinity value, then we can change later.
2021-03-10 10:30:23 +01:00
masayuki.harada
ff994453a4
Merge remote-tracking branch 'remotes/oai/develop' into HEAD
...
# Conflicts:
# openair3/S1AP/s1ap_eNB.c
# openair3/S1AP/s1ap_eNB_handlers.c
2021-03-08 14:51:11 +09:00
rmagueta
245f1e066f
Improvements in RA-Msg4
2021-03-04 01:23:56 +00:00
luis_pereira87
d0b9146cd0
Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created)
2021-03-03 01:27:50 +00:00
rmagueta
abb894be6b
Draft RA-Msg4 at gNB
2021-03-02 20:20:11 +00:00
rmagueta
5f66269a8b
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
luis_pereira87
ca5eb17f28
Fix SIB1 with offsetToPointA = 86
2021-03-01 22:18:51 +00:00
rmagueta
deef82d70b
Fix RA-Msg3 to logical channel CCCH
2021-03-01 19:23:23 +00:00
luis_pereira87
f18db2bad8
Update SIB1 with q_RxLevMin to -65 and MCC and MNC to match SIM card values
2021-03-01 10:32:12 +00:00
Guhan
02ae169250
Rebased to latest develop and removed nr_rx_acknack function
2021-03-01 11:43:30 +05:30
guhan
5d4f815181
Removed dead code
2021-02-26 11:50:13 +05:30
k.ramya
0a0a5e48c3
code rearrangement
2021-02-26 11:37:58 +05:30
Francesco Mani
17f830e587
revert to old rrc csi confriguration
2021-02-26 11:29:28 +05:30
r.karey
8c488bfdf8
UCI bitlength calculation
2021-02-26 10:51:42 +05:30
r.karey
03ea28df44
Merged rrc_gNB_reconfig for NR_CSI_reporting
2021-02-26 10:48:37 +05:30
r.karey
21c0af1b7c
Merged rrc_gNB_reconfig for NR_CSI_reporting
2021-02-26 10:20:51 +05:30
francescomani
1541a6b808
fix for ssb preamble index association in rrc configuration
2021-02-25 16:24:28 +01:00
rmagueta
cf70265ba6
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
francescomani
9afb19858a
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-25 12:04:24 +01:00
rmagueta
48811d0f34
Merge branch 'develop' into develop-SA-CBRA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
rmagueta
910154c7af
Merge branch 'develop' into develop-SA-RA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
rmagueta
495ba8920d
Merge branch 'develop-SA-RA' into develop-SA-CBRA
2021-02-22 16:35:06 +00:00
rmagueta
bed43a2a79
Address review comments
2021-02-22 16:31:13 +00:00
rmagueta
4ea560f291
Address review comments
2021-02-22 16:01:05 +00:00