openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h · 4301582f88efd4f44982316cbac6ba09c75cd997 · wangjie / OpenXG-RAN

Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS · 2473a25c

Raymond Knopp authored Apr 06, 2021

Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

2473a25c

nr_mac_common.h 7.65 KB

Replace nr_mac_common.h