From 5d25c522a295325e905d3b9fbb14d133a14125a9 Mon Sep 17 00:00:00 2001
From: Roberto Louro Magueta <rmagueta@allbesmart.pt>
Date: Fri, 17 Sep 2021 09:40:16 +0000
Subject: [PATCH] Revert "Temporary fix in min_rb for pf_ul"
This reverts commit c5429cbf574cbdf07d0814207b477a2381b8c38e
---
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 012378a4619..b95dd29aeb2 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -1044,7 +1044,7 @@ void pf_ul(module_id_t module_id,
gNB_MAC_INST *nrmac = RC.nrmac[module_id];
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels[CC_id].ServingCellConfigCommon;
NR_UE_info_t *UE_info = &nrmac->UE_info;
- int min_rb = 80;
+ const int min_rb = 80;
float coeff_ue[MAX_MOBILES_PER_GNB];
// UEs that could be scheduled
int ue_array[MAX_MOBILES_PER_GNB];
@@ -1063,12 +1063,6 @@ void pf_ul(module_id_t module_id,
int rbStart = sched_ctrl->active_ubwp ? NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE) : 0;
const uint16_t bwpSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
-
- // FIXME: Remove this after fix the min_rb
- if( (bwpSize - rbStart) < min_rb) {
- min_rb = bwpSize - rbStart;
- }
-
NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
NR_pusch_semi_static_t *ps = &sched_ctrl->pusch_semi_static;
--
GitLab