# HG changeset patch
# User Marco Miozzo <marco.miozzo@cttc.es>
# Date 1355761869 -3600
# Node ID 86b1cbca3740175a5ffa47adddc27135d2588923
# Parent  001e587c05898d86e25509634ec62a290ad22b9f
Update HARQ_DL_TIMEOUT to 11 both in RR and PF schedulers

diff -r 001e587c0589 -r 86b1cbca3740 src/lte/model/pf-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 {
 
diff -r 001e587c0589 -r 86b1cbca3740 src/lte/model/rr-ff-mac-scheduler.cc
--- 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);
diff -r 001e587c0589 -r 86b1cbca3740 src/lte/model/rr-ff-mac-scheduler.h
--- 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 {