diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c index a711695228c6cddf3628f5e1177bae59d46f6549..c0413c3411d9e753d9267ce951406898b20a859e 100644 --- a/openair2/LAYER2/MAC/pre_processor.c +++ b/openair2/LAYER2/MAC/pre_processor.c @@ -2365,11 +2365,14 @@ void ulsch_scheduler_pre_ue_select( } // UE round >0 for ( UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++ ) { + if (UE_list->active[UE_id] == FALSE) + continue; + rnti = UE_RNTI(module_idP,UE_id); - CC_id = UE_PCCID(module_idP,UE_id); if (rnti ==NOT_A_RNTI) continue; + CC_id = UE_PCCID(module_idP,UE_id); if (UE_list->UE_template[CC_id][UE_id].configured == FALSE) continue; @@ -2473,11 +2476,18 @@ void ulsch_scheduler_pre_ue_select( } for ( UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++ ) { + if (UE_list->active[UE_id] == FALSE) + continue; + rnti = UE_RNTI(module_idP,UE_id); - CC_id = UE_PCCID(module_idP,UE_id); if (rnti ==NOT_A_RNTI) continue; + CC_id = UE_PCCID(module_idP,UE_id); + + if (UE_id > last_ulsch_ue_id[CC_id]) + continue; + if (UE_list->UE_template[CC_id][UE_id].configured == FALSE) continue; @@ -2496,9 +2506,6 @@ void ulsch_scheduler_pre_ue_select( } } - if (UE_id > last_ulsch_ue_id[CC_id]) - continue; - for(i = 0;i<ulsch_ue_select[CC_id].ue_num;i++){ if(ulsch_ue_select[CC_id].list[i].UE_id == UE_id){ break;