From f7bab7374145ca2702a243c7a5214d3dc22c7467 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nicola@baldo.biz>
Date: Tue, 22 Nov 2016 10:54:20 +0100
Subject: [PATCH] lte: (fixes #2048) Fix scheduler resource allocation when
 CQI==0 (out of range)

---
 src/lte/model/cqa-ff-mac-scheduler.cc    | 2 +-
 src/lte/model/fdmt-ff-mac-scheduler.cc   | 2 +-
 src/lte/model/fdtbfq-ff-mac-scheduler.cc | 2 +-
 src/lte/model/pf-ff-mac-scheduler.cc     | 2 +-
 src/lte/model/pss-ff-mac-scheduler.cc    | 6 +++---
 src/lte/model/tta-ff-mac-scheduler.cc    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc
index c31557893..0b10a5105 100644
--- a/src/lte/model/cqa-ff-mac-scheduler.cc
+++ b/src/lte/model/cqa-ff-mac-scheduler.cc
@@ -1164,7 +1164,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
             }
 
           uint8_t cqi1 = sbCqis.at (0);
-          uint8_t cqi2 = 1;
+          uint8_t cqi2 = 0;
           if (sbCqis.size () > 1)
             {
               cqi2 = sbCqis.at (1);
diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc
index 76d2a1cd2..1f8344b34 100644
--- a/src/lte/model/fdmt-ff-mac-scheduler.cc
+++ b/src/lte/model/fdmt-ff-mac-scheduler.cc
@@ -901,7 +901,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch
                   sbCqi = (*itCqi).second.m_higherLayerSelected.at (i).m_sbCqi;
                 }
               uint8_t cqi1 = sbCqi.at (0);
-              uint8_t cqi2 = 1;
+              uint8_t cqi2 = 0;
               if (sbCqi.size () > 1)
                 {
                   cqi2 = sbCqi.at (1);
diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc
index e0f9a417c..fe506fb61 100644
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc
@@ -1125,7 +1125,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S
                   sbCqi = (*itCqi).second.m_higherLayerSelected.at (k).m_sbCqi;
                 }
               uint8_t cqi1 = sbCqi.at (0);
-              uint8_t cqi2 = 1;
+              uint8_t cqi2 = 0;
               if (sbCqi.size () > 1)
                 {
                   cqi2 = sbCqi.at (1);
diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc
index 5b563d3af..5e3ecee0f 100644
--- a/src/lte/model/pf-ff-mac-scheduler.cc
+++ b/src/lte/model/pf-ff-mac-scheduler.cc
@@ -968,7 +968,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
                   sbCqi = (*itCqi).second.m_higherLayerSelected.at (i).m_sbCqi;
                 }
               uint8_t cqi1 = sbCqi.at (0);
-              uint8_t cqi2 = 1;
+              uint8_t cqi2 = 0;
               if (sbCqi.size () > 1)
                 {
                   cqi2 = sbCqi.at (1);
diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc
index 61c566fac..9ad9e30f9 100644
--- a/src/lte/model/pss-ff-mac-scheduler.cc
+++ b/src/lte/model/pss-ff-mac-scheduler.cc
@@ -1110,7 +1110,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
                         }
         
                       uint8_t cqi1 = sbCqis.at (0);
-                      uint8_t cqi2 = 1;
+                      uint8_t cqi2 = 0;
                       if (sbCqis.size () > 1)
                         {
                           cqi2 = sbCqis.at (1);
@@ -1181,7 +1181,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
                         }
         
                       uint8_t cqi1 = sbCqis.at( 0);
-                      uint8_t cqi2 = 1;
+                      uint8_t cqi2 = 0;
                       if (sbCqis.size () > 1)
                         {
                           cqi2 = sbCqis.at(1);
@@ -1275,7 +1275,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
                         }
         
                       uint8_t cqi1 = sbCqis.at(0);
-                      uint8_t cqi2 = 1;
+                      uint8_t cqi2 = 0;
                       if (sbCqis.size () > 1)
                         {
                           cqi2 = sbCqis.at(1);
diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc
index 014ef54cf..e30c3809a 100644
--- a/src/lte/model/tta-ff-mac-scheduler.cc
+++ b/src/lte/model/tta-ff-mac-scheduler.cc
@@ -916,7 +916,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
                 }
 
               uint8_t cqi1 = sbCqi.at (0);
-              uint8_t cqi2 = 1;
+              uint8_t cqi2 = 0;
               if (sbCqi.size () > 1)
                 {
                   cqi2 = sbCqi.at (1);