From 5759d396d47707a4ade85a5c05c0eb294b020752 Mon Sep 17 00:00:00 2001 From: Francisco Date: Thu, 25 Nov 2021 17:39:00 +0000 Subject: [PATCH] nr,gnb,sched: avoid that ConRes CE gets allocated twice --- srsgnb/src/stack/mac/sched_nr_ue.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srsgnb/src/stack/mac/sched_nr_ue.cc b/srsgnb/src/stack/mac/sched_nr_ue.cc index d67dceb66..ba7431de4 100644 --- a/srsgnb/src/stack/mac/sched_nr_ue.cc +++ b/srsgnb/src/stack/mac/sched_nr_ue.cc @@ -161,16 +161,16 @@ void ue::mac_buffer_state(uint32_t ce_lcid, uint32_t nof_cmds) } } -void ue::rlc_buffer_state(uint32_t lcid, uint32_t newtx, uint32_t retx) +void ue::rlc_buffer_state(uint32_t lcid, uint32_t newtx, uint32_t priotx) { - if (lcid == 0 and buffers.get_dl_tx_total(0) == 0) { + if (lcid == 0 and (newtx + priotx > 0) and buffers.get_dl_tx_total(0) == 0) { // In case of DL-CCCH, schedule ConRes CE // Note1: rlc_buffer_state may be called multiple times for the same CCCH. Thus, we need to confirm lcid=0 buffer // state is zero to avoid that multiple CEs being scheduled. // Note2: use push_front because ConRes CE has priority buffers.pending_ces.push_front({srsran::mac_sch_subpdu_nr::CON_RES_ID, cfg().carriers[0].cc}); } - buffers.dl_buffer_state(lcid, newtx, retx); + buffers.dl_buffer_state(lcid, newtx, priotx); } void ue::new_slot(slot_point pdcch_slot)