Updated PfFfMacScheduler

No HARQ resource allocated if HARQ retransmission cannot be performed in the current TTI
eevadas · Nov 6, 2019 · da1779d · da1779d
1 parent 60cfa6d
commit da1779d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc
@@ -755,6 +755,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
                   break;
                 }
             }
+        int isHarqBuffered=0;
           if (free)
             {
               // use the same RBGs for the retx
@@ -800,6 +801,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
                 }
               else
                 {
+                  isHarqBuffered=1;
                   // HARQ retx cannot be performed on this TTI -> store it
                   dlInfoListUntxed.push_back (m_dlInfoListBuffered.at (i));
                   NS_LOG_INFO (this << " No resource for this retx -> buffer it");
@@ -881,7 +883,10 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
               NS_FATAL_ERROR ("Unable to find HARQ timer for RNTI " << (uint16_t)rnti);
             }
           (*itHarqTimer).second.at (harqId) = 0;
-          ret.m_buildDataList.push_back (newEl);
+          if(isHarqBuffered==0)
+          {
+            ret.m_buildDataList.push_back (newEl);
+          }
           rntiAllocated.insert (rnti);
         }
       else