rmagueta
8613aeb9e6
Fixes after merge
...
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
2021-04-18 12:42:34 +02:00
Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +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
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
rmagueta
ddfc737c65
Fix search space for Msg2 and Msg4 at gNB
2021-04-09 19:46:35 +01:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
rmagueta
79864d001b
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-04-06 11:38:33 +01:00
Laurent Thomas
89598e3bad
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1
2021-04-06 12:11:29 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
Cedric Roux
46c1aff489
fix: do NR only if at least one gNB is connected to the eNB
...
We used to set 'does_nr' of an UE if we detect ENDC supported in the
UE capabilities.
Then we activate NR measurements if 'does_nr' is true.
The problem is that if the eNB is not connected to a gNB but the UE
reports some NR measurements (because a gNB is running somewhere near)
then the eNB will crash when starting the switch to NR.
A (quick) solution is to set 'does_nr' only if there is a gNB connected to
the eNB.
Maybe not the best solution. To be changed if needed.
2021-03-31 16:39:30 +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
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
Robert Schmidt
576df55450
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
2021-03-30 10:48:57 +02: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
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
hardy
a84b1b4340
Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b
2021-03-28 21:36:45 +02:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01: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