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

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -599,12 +599,12 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
       UE_info->CellGroup[UE_id] = CellGroup;
       LOG_I(NR_MAC,"Modified UE_id %d/%x with CellGroup\n",UE_id,rnti);
       process_CellGroup(CellGroup,&UE_info->UE_sched_ctrl[UE_id]);
-// update coreset/searchspace
+      // update coreset/searchspace
       void *bwpd = NULL;
       target_ss = NR_SearchSpace__searchSpaceType_PR_common;
-      if ((UE_info->UE_sched_ctrl->active_bwp)) {
+      if ((UE_info->UE_sched_ctrl[UE_id].active_bwp)) {
         target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
-        bwpd = (void*)UE_info->UE_sched_ctrl->active_bwp->bwp_Dedicated;
+        bwpd = (void*)UE_info->UE_sched_ctrl[UE_id].active_bwp->bwp_Dedicated;
       }
       else if (CellGroup->spCellConfig &&
                  CellGroup->spCellConfig->spCellConfigDedicated &&
@@ -612,9 +612,9 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
         target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
         bwpd = (void*)CellGroup->spCellConfig->spCellConfigDedicated->initialDownlinkBWP;
       }
-      UE_info->UE_sched_ctrl->search_space = get_searchspace(scc, bwpd, target_ss);
-      UE_info->UE_sched_ctrl->coreset = get_coreset(scc, bwpd, UE_info->UE_sched_ctrl->search_space, target_ss);
-      UE_info->UE_sched_ctrl->maxL = 2;
+      UE_info->UE_sched_ctrl[UE_id].search_space = get_searchspace(scc, bwpd, target_ss);
+      UE_info->UE_sched_ctrl[UE_id].coreset = get_coreset(scc, bwpd, UE_info->UE_sched_ctrl[UE_id].search_space, target_ss);
+      UE_info->UE_sched_ctrl[UE_id].maxL = 2;
     }
   }
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);