fix: correctly skip resource allocation if ul_disabled

master
Piotr Gawlowicz 2 years ago committed by Piotr
parent 3178abf37b
commit 5eed9297d3

@ -62,8 +62,11 @@ void sched_time_pf::new_tti(sched_ue_list& ue_db, sf_sched* tti_sched)
}
if (it->second.ul_h != nullptr) {
// Allocate only if UL carrier is enabled
if (!u.second->get_ue_cfg().supported_cc_list[cc_cfg->enb_cc_idx].ul_disabled) {
ul_queue.push(&it->second);
for (auto& i : u.second->get_ue_cfg().supported_cc_list) {
if (i.enb_cc_idx == cc_cfg->enb_cc_idx and not i.ul_disabled) {
ul_queue.push(&it->second);
break;
}
}
}
}

@ -122,9 +122,17 @@ void sched_time_rr::sched_ul_newtxs(sched_ue_list& ue_db, sf_sched* tti_sched, s
}
sched_ue& user = *iter->second;
// Allocate only if UL carrier is enabled
if (user.get_ue_cfg().supported_cc_list[cc_cfg->enb_cc_idx].ul_disabled) {
bool ul_disabled = false;
for (auto& i : user.get_ue_cfg().supported_cc_list) {
if (i.enb_cc_idx == cc_cfg->enb_cc_idx) {
ul_disabled = i.ul_disabled;
break;
}
}
if (ul_disabled) {
continue;
}
const ul_harq_proc* h = get_ul_newtx_harq(user, tti_sched);
// Check if there is a empty harq
if (h == nullptr) {

Loading…
Cancel
Save