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

# Conflicts: # openair2/LAYER2/NR_MAC_gNB/config.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-06 10:11:49 +01:00
parent a772400ffa baa76323d2
commit 4f29c73bb6
43 changed files with 701 additions and 853 deletions
@@ -2056,6 +2056,7 @@ void configure_gnb_du_mac(int inst) {
                        rrc->configuration.minRXTXTIME,
                        rrc->configuration.scc,
                        NULL,
+                        NULL,
                        0,
                        0, // rnti
                        (NR_CellGroupConfig_t *)NULL