From e8cbb95ab2a9159eda4bca052db8cfb9589b3dcc Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Wed, 31 Oct 2012 12:06:26 +0100 Subject: [PATCH] Bug-fix: Update DoSchedUlTriggerReq of both RR and PF for avoiding allocation of resources to UEs with no data to send --- src/lte/model/pf-ff-mac-scheduler.cc | 2 +- src/lte/model/rr-ff-mac-scheduler.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index 167263211..029a61b0a 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -1340,7 +1340,7 @@ PfFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched do { std::set ::iterator itRnti = rntiAllocated.find ((*it).first); - if (itRnti!=rntiAllocated.end ()) + if ((itRnti!=rntiAllocated.end ())||((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it it++; diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 1539bea61..b4d40e350 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -1177,7 +1177,7 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched do { std::set ::iterator itRnti = rntiAllocated.find ((*it).first); - if (itRnti!=rntiAllocated.end ()) + if ((itRnti!=rntiAllocated.end ())||((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it it++;