Update HARQ_DL_TIMEOUT to 11 both in RR and PF schedulers
authorMarco Miozzo <marco.miozzo@cttc.es>
Mon, 17 Dec 2012 17:31:09 +0100
changeset 9565 86b1cbca3740
parent 9563 001e587c0589
child 9566 27ae6d9e0590
Update HARQ_DL_TIMEOUT to 11 both in RR and PF schedulers
src/lte/model/pf-ff-mac-scheduler.h
src/lte/model/rr-ff-mac-scheduler.cc
src/lte/model/rr-ff-mac-scheduler.h
--- a/src/lte/model/pf-ff-mac-scheduler.h	Mon Dec 17 16:02:18 2012 +0100
+++ b/src/lte/model/pf-ff-mac-scheduler.h	Mon Dec 17 17:31:09 2012 +0100
@@ -37,7 +37,7 @@
 
 
 #define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 8
+#define HARQ_DL_TIMEOUT 11
 
 namespace ns3 {
 
--- a/src/lte/model/rr-ff-mac-scheduler.cc	Mon Dec 17 16:02:18 2012 +0100
+++ b/src/lte/model/rr-ff-mac-scheduler.cc	Mon Dec 17 17:31:09 2012 +0100
@@ -1472,6 +1472,7 @@
                   // restart from the first
                   it = m_ceBsrRxed.begin ();
                 }
+              NS_LOG_DEBUG (this << " CQI = 0");
               continue; // CQI == 0 means "out of range" (see table 7.2.3-1 of 36.213)
             }
           uldci.m_mcs = m_amc->GetMcsFromCqi (cqi);
--- a/src/lte/model/rr-ff-mac-scheduler.h	Mon Dec 17 16:02:18 2012 +0100
+++ b/src/lte/model/rr-ff-mac-scheduler.h	Mon Dec 17 17:31:09 2012 +0100
@@ -31,7 +31,7 @@
 #include <ns3/lte-amc.h>
 
 #define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 8
+#define HARQ_DL_TIMEOUT 11
 
 namespace ns3 {