From 4fa8d24e436738ef972de99288ebc14dc8ead32a Mon Sep 17 00:00:00 2001
From: Marco Miozzo <marco.miozzo@cttc.es>
Date: Tue, 21 Feb 2012 18:06:15 +0100
Subject: [PATCH] Update LteUePhy for generating wideband and subband CQIs with
 LteAmc::MiErrorModel

---
 src/lte/model/lte-ue-phy.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc
index 736c4d3eb..aa277f503 100644
--- a/src/lte/model/lte-ue-phy.cc
+++ b/src/lte/model/lte-ue-phy.cc
@@ -310,14 +310,13 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
 {
   NS_LOG_FUNCTION (this);
 
-  std::vector<int> cqi = m_amc->CreateCqiFeedbacks (sinr, GetRbgSize ());
-
   // CREATE DlCqiIdealControlMessage
   Ptr<DlCqiIdealControlMessage> msg = Create<DlCqiIdealControlMessage> ();
   CqiListElement_s dlcqi;
-
+  std::vector<int> cqi;
   if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity)
     {
+      cqi = m_amc->CreateCqiFeedbacks (sinr, m_dlBandwidth);
 
       int nbSubChannels = cqi.size ();
       double cqiSum = 0.0;
@@ -350,7 +349,8 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
     }
   else if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity)
     {
-      int nbSubChannels = cqi.size ();
+      cqi = m_amc->CreateCqiFeedbacks (sinr, GetRbgSize ());
+      int nbSubChannels = m_dlBandwidth;
       int rbgSize = GetRbgSize ();
       double cqiSum = 0.0;
       int cqiNum = 0;