• rmagueta's avatar
    Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS · 0a3f128e
    rmagueta authored
    # Conflicts:
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
    #	openair2/LAYER2/NR_MAC_gNB/config.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    #	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
    #	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
    0a3f128e
gNB_scheduler_RA.c 74.7 KB