merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h (664d1a4b) · Commits · MAQ5G-PFC / OAI-RAN-5G-sheduler_MaxTBS · GitLab

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

664d1a4b

Commit 664d1a4b authored 7 years ago by Xu Bo

Downloads
- Plain Diff

merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h

parents 098a177d b7e2a90e

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

openair2/COMMON/mac_rlc_primitives.h 1 addition, 0 deletions

openair2/COMMON/mac_rlc_primitives.h
openair2/LAYER2/MAC/defs.h 10 additions, 0 deletions

openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c 23 additions, 1 deletion

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/pre_processor.c 10 additions, 5 deletions

openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c 1 addition, 1 deletion

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c
openair2/LAYER2/RLC/rlc.h 1 addition, 0 deletions

openair2/LAYER2/RLC/rlc.h
openair2/LAYER2/RLC/rlc_mac.c 1 addition, 0 deletions

openair2/LAYER2/RLC/rlc_mac.c
openair2/RRC/LITE/proto.h 2 additions, 1 deletion

openair2/RRC/LITE/proto.h
openair2/RRC/LITE/rrc_common.c 69 additions, 2 deletions

openair2/RRC/LITE/rrc_common.c
openair2/RRC/LITE/rrc_eNB.c 19 additions, 4 deletions

openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB_S1AP.c 2 additions, 1 deletion

openair2/RRC/LITE/rrc_eNB_S1AP.c

with 139 additions and 15 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