Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS

# Conflicts: # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c # openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
parent 2c907fb6e5 cfe8224590
commit 4301582f88
132 changed files with 30491 additions and 4065 deletions
@@ -183,6 +183,7 @@ eth_params_t *eth_params;
 double cpuf;

 int oaisim_flag=0;
+uint8_t proto_agent_flag = 0;


 /* forward declarations */