From 22617b21d484558ae45717033c1427f9277a684a Mon Sep 17 00:00:00 2001 From: francescomani Date: Tue, 15 Nov 2022 09:32:05 +0100 Subject: [PATCH] fixes for 2 bugs in the ULSCH scheduler --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c index 6c95048ce7..ac3c6d14af 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c @@ -1540,11 +1540,11 @@ void pf_ul(module_id_t module_id, /* Loop UE_list to calculate throughput and coeff */ UE_iterator(UE_list, UE) { - if (UE->Msg4_ACKed != true) + NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl; + if (UE->Msg4_ACKed != true || sched_ctrl->ul_failure == 1) continue; LOG_D(NR_MAC,"pf_ul: preparing UL scheduling for UE %04x\n",UE->rnti); - NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl; NR_UE_UL_BWP_t *current_BWP = &UE->current_UL_BWP; int rbStart = 0; // wrt BWP start @@ -1576,7 +1576,7 @@ void pf_ul(module_id_t module_id, // we have filled all with mandatory retransmissions // no need to schedule new transmissions - if (remainUEs == 0) + if (remainUEs < 0) return; continue; @@ -1639,7 +1639,7 @@ void pf_ul(module_id_t module_id, // we have filled all with mandatory retransmissions // no need to schedule new transmissions - if (remainUEs == 0) + if (remainUEs < 0) return; sched_pusch->nrOfLayers = 1;