From 5fb72906f38e33eeca790b4c923d099102fa0480 Mon Sep 17 00:00:00 2001 From: Thomas Schlichter Date: Tue, 1 Jul 2025 07:48:21 +0000 Subject: [PATCH] gNB: fix NTN UL retransmissions Re-add to consider the cellSpecificKoffset_r17 for UL retransmissions. This got lost in commit c8387d706cbd7b0f4905b718bb4c84996e412966 --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c index 534b955f7b..c7f29a2c39 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c @@ -1804,8 +1804,8 @@ static bool allocate_ul_retransmission(gNB_MAC_INST *nrmac, sched_ctrl->cce_index = CCEIndex; fill_pdcch_vrb_map(nrmac, CC_id, &sched_ctrl->sched_pdcch, CCEIndex, sched_ctrl->aggregation_level, dci_beam_idx); int slots_frame = nrmac->frame_structure.numb_slots_frame; - retInfo->frame = (frame + (slot + tda_info.k2) / slots_frame) % MAX_FRAME_NUMBER; - retInfo->slot = (slot + tda_info.k2) % slots_frame; + retInfo->frame = (frame + (slot + tda_info.k2 + get_NTN_Koffset(scc)) / slots_frame) % MAX_FRAME_NUMBER; + retInfo->slot = (slot + tda_info.k2 + get_NTN_Koffset(scc)) % slots_frame; /* Get previous PSUCH field info */ sched_ctrl->sched_pusch = *retInfo; NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;