From e73397daaf04774623cc14b8c9ce1193e380c4e4 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Thu, 25 Oct 2012 17:45:02 +0200 Subject: [PATCH] Bug-fix DoSchedDlTriggerReq:startRbg both in RR and PR erroneous initialization --- 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 a550ceef0..d1418e4c1 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -654,7 +654,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched // find RBGs for sending HARQ retx uint8_t j = 0; uint8_t rbgId = (dciRbg.at (dciRbg.size () - 1) + 1) % rbgNum; - uint8_t startRbg = dciRbg.at (dciRbg.size () - 1) + 1; + uint8_t startRbg = dciRbg.at (dciRbg.size () - 1); std::vector rbgMapCopy = rbgMap; while ((j < dciRbg.size ())&&(startRbg!=rbgId)) { diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index b2e09b2b4..179320e1f 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -616,7 +616,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched // find RBGs for sending HARQ retx uint8_t j = 0; uint8_t rbgId = (dciRbg.at (dciRbg.size () - 1) + 1) % rbgNum; - uint8_t startRbg = dciRbg.at (dciRbg.size () - 1) + 1; + uint8_t startRbg = dciRbg.at (dciRbg.size () - 1); std::vector rbgMapCopy = rbgMap; while ((j < dciRbg.size ())&&(startRbg!=rbgId)) {