Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OAI-RAN-5G-sheduler_MaxTBS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9adf1999

Commit 9adf1999 authored 6 years ago by Cedric Roux

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/oai_ue_fixes' into develop

Conflicts:
	openair2/RRC/LTE/rrc_eNB.c

parents 2f639e45 9edcd9b9

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cmake_targets/build_oai 1 addition, 1 deletion

cmake_targets/build_oai
cmake_targets/tools/init_nas_nos1 1 addition, 1 deletion

cmake_targets/tools/init_nas_nos1
cmake_targets/tools/init_nas_s1 0 additions, 0 deletions

cmake_targets/tools/init_nas_s1
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c 1 addition, 1 deletion

openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
openair1/SCHED_UE/phy_procedures_lte_ue.c 6 additions, 1 deletion

openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/RRC/LTE/rrc_eNB.c 29 additions, 19 deletions

openair2/RRC/LTE/rrc_eNB.c
targets/RT/USER/lte-uesoftmodem.c 36 additions, 35 deletions

targets/RT/USER/lte-uesoftmodem.c

with 74 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment