From de5ce5145ce2e2cc6de6c5c24e5de99ca08c708a Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Fri, 25 Nov 2011 19:45:06 +0100 Subject: [PATCH] fixed RR scheduler buffer status report bug --- src/lte/examples/lena-epc-first.cc | 2 +- src/lte/model/rr-ff-mac-scheduler.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lte/examples/lena-epc-first.cc b/src/lte/examples/lena-epc-first.cc index b8ec256f0..55775bf76 100644 --- a/src/lte/examples/lena-epc-first.cc +++ b/src/lte/examples/lena-epc-first.cc @@ -56,7 +56,7 @@ main (int argc, char *argv[]) Ptr lteHelper = CreateObject (); Ptr epcHelper = CreateObject (); lteHelper->SetEpcHelper (epcHelper); - //lteHelper->SetSchedulerType("ns3::RrFfMacScheduler"); + lteHelper->SetSchedulerType("ns3::RrFfMacScheduler"); ConfigStore inputConfig; inputConfig.ConfigureDefaults(); diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index f556aa734..c0a3da132 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -328,7 +328,7 @@ RrFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sch // remove old entries of this UE-LC if (((*it).m_rnti == params.m_rnti)&&((*it).m_logicalChannelIdentity == params.m_logicalChannelIdentity)) { - m_rlcBufferReq.erase (it); + it = m_rlcBufferReq.erase (it); newLc = false; } }