From c4269df612248d40c94addd5e18365caff11cfcd Mon Sep 17 00:00:00 2001 From: Biljana Bojovic Date: Fri, 2 May 2014 17:06:37 +0200 Subject: [PATCH] Bug 1894 - CqaFfMacScheduler needs an update --- RELEASE_NOTES | 1 + src/lte/model/cqa-ff-mac-scheduler.cc | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 37736a90a..b39e32ad5 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -84,6 +84,7 @@ Bugs fixed - Bug 1889 - PointToPointNetDevice: In some cases MacTxDrop trace is not called - Bug 1890 - UdpClientTrace: MPEG frame size is squeezed into (insufficient) 16 bit integer - Bug 1891 - UdpSocketImpl::GetSockName doesn't return the IPv6 address +- Bug 1894 - CqaFfMacScheduler needs an update - Bug 1895 - IP header Source Address changed while forwarding RREQ - Bug 1903 - Namespace usage in olsr-state.cc/h diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc index f562edc34..241a30253 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.cc +++ b/src/lte/model/cqa-ff-mac-scheduler.cc @@ -1799,20 +1799,13 @@ CqaFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sche if (m_harqOn == true) { // Process UL HARQ feedback - // update UL HARQ proc id - std::map ::iterator itProcId; - for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++) - { - (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM; - } - for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++) { if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk) { // retx correspondent block: retrieve the UL-DCI uint16_t rnti = params.m_ulInfoList.at (i).m_rnti; - itProcId = m_ulHarqCurrentProcessId.find (rnti); + std::map ::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti); if (itProcId == m_ulHarqCurrentProcessId.end ()) { NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);