openair2/LAYER2/NR_MAC_gNB/mac_proto.h · b35c1b3fe635442f2ac875936dfdb660889210b5 · lizhongxiao / OpenXG UE

Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs · b35c1b3f

rmagueta authored Sep 10, 2021

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c

b35c1b3f

mac_proto.h 18.1 KB

Replace mac_proto.h