openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c · c5ab33ffd97fa556763690d285a812664c4fc287 · lizhongxiao / OpenXG-RAN

Merge remote-tracking branch 'origin/develop' into develop-SA-RA · c5ab33ff

rmagueta authored Feb 11, 2021

# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

c5ab33ff

gNB_scheduler_ulsch.c 47.7 KB

Replace gNB_scheduler_ulsch.c