# HG changeset patch
# User Biljana Bojovic <biljana.bojovic@gmail.com>
# Date 1399043197 -7200
# Node ID ee392f91fda60f6bd678001b42b8f61707bff0c2
# Parent  6d21630060e2512b152d015fbf5778c1f9f88312
Bug 1894 - CqaFfMacScheduler needs an update

diff -r 6d21630060e2 -r ee392f91fda6 RELEASE_NOTES
--- a/RELEASE_NOTES	Fri May 02 16:48:50 2014 +0200
+++ b/RELEASE_NOTES	Fri May 02 17:06:37 2014 +0200
@@ -84,6 +84,7 @@
 - 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 -r 6d21630060e2 -r ee392f91fda6 src/lte/model/cqa-ff-mac-scheduler.cc
--- a/src/lte/model/cqa-ff-mac-scheduler.cc	Fri May 02 16:48:50 2014 +0200
+++ b/src/lte/model/cqa-ff-mac-scheduler.cc	Fri May 02 17:06:37 2014 +0200
@@ -1799,20 +1799,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::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 <uint16_t, uint8_t>::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);