• Eurecom's avatar
    Merge branch 'bandwidth-testing' of... · eceb0d79
    Eurecom authored
    Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
    
    Conflicts:
    	executables/nr-uesoftmodem.c
    	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
    	openair1/SIMULATION/TOOLS/random_channel.c
    	openair2/LAYER2/NR_MAC_UE/mac_proto.h
    	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
    	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    eceb0d79
mac_proto.h 19.5 KB