From 31b12e2e0c2fb0c9755a8151bcef5baea56ad82b Mon Sep 17 00:00:00 2001 From: Luis Pereira Date: Fri, 7 May 2021 10:16:21 +0200 Subject: [PATCH] Revert "Temporary fix for skip DL slots with invalid dl_DataToUL_ACK timing with OAI UE" This reverts commit 9512e914faa9f3f56cf33dc517ccd9c2688505ec --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c index 84ef218120..6adc65ad37 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c @@ -785,11 +785,6 @@ void nr_schedule_ue_spec(module_id_t module_id, if (!is_xlsch_in_slot(gNB_mac->dlsch_slot_bitmap[slot / 64], slot)) return; - // FIXME: Feedback timing for ack/nack are not adapted for OAI UE, which has a rx/tx delay of 6 slots. - // As k2 for pusch needs to be at least 6, dl_DataToUL_ACK needs to be not lower than 6. - if(IS_SOFTMODEM_RFSIM && slot!=1) - return; - /* PREPROCESSOR */ gNB_mac->pre_processor_dl(module_id, frame, slot);