From 1afb414e34e4f71a4c36d064d3623daf4b50e11a Mon Sep 17 00:00:00 2001
From: Marco Miozzo <marco.miozzo@cttc.es>
Date: Thu, 27 Oct 2011 10:25:24 +0200
Subject: [PATCH] Fix merge bug in LenaHelper::DoStart on TraceFadingLossModel

---
 src/lte/helper/lena-helper.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc
index 8390716f3..3e15e3d07 100644
--- a/src/lte/helper/lena-helper.cc
+++ b/src/lte/helper/lena-helper.cc
@@ -92,13 +92,20 @@ LenaHelper::DoStart (void)
       NS_LOG_LOGIC (this << " using a SpectrumPropagationLossModel in UL");
       m_uplinkChannel->AddSpectrumPropagationLossModel (ulSplm);
     }
-  if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0)
+    else
     {
       NS_LOG_LOGIC (this << " using a PropagationLossModel in UL");
       Ptr<PropagationLossModel> ulPlm = m_uplinkPropagationModel->GetObject<PropagationLossModel> ();            
       NS_ASSERT_MSG (ulPlm != 0, " " << m_uplinkPropagationModel << " is neither PropagationLossModel nor SpectrumPropagationLossModel");       
       m_uplinkChannel->AddPropagationLossModel (ulPlm);
     }
+    
+  if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0)
+    {
+      m_fadingModule = m_fadingModelFactory.Create<TraceFadingLossModel> ();
+      m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
+      m_uplinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
+    }
 
   m_macStats = CreateObject<MacStatsCalculator> ();
   m_rlcStats = CreateObject<RlcStatsCalculator> ();