From b7f6c0fa5d463753c7f289c9ad64b79e55dfe4dd Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Tue, 19 Apr 2011 17:32:20 +0200
Subject: [PATCH] fixed LENA-78 m_dlBandwidth not initialized

---
 src/lte/model/lte-enb-net-device.cc | 8 +++++++-
 src/lte/model/lte-enb-net-device.h  | 6 ++++++
 src/lte/model/lte-ue-net-device.cc  | 8 +++++++-
 src/lte/model/lte-ue-net-device.h   | 6 ++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc
index 3c48fe38b..f3cd93525 100644
--- a/src/lte/model/lte-enb-net-device.cc
+++ b/src/lte/model/lte-enb-net-device.cc
@@ -108,7 +108,6 @@ LteEnbNetDevice::LteEnbNetDevice (Ptr<Node> node, Ptr<LteEnbPhy> phy, Ptr<LteEnb
   SetNode (node);
   NS_ASSERT_MSG (m_cellIdCounter < 65535, "max num eNBs exceeded");
   m_cellId = ++m_cellIdCounter;
-  UpdateConfig ();
 }
 
 LteEnbNetDevice::~LteEnbNetDevice (void)
@@ -218,6 +217,13 @@ LteEnbNetDevice::SetDlBandwidth (uint8_t bw)
     }
 }
 
+void 
+LteEnbNetDevice::DoStart (void)
+{
+  UpdateConfig ();
+}
+
+
 
 bool
 LteEnbNetDevice::DoSend (Ptr<Packet> packet, const Mac48Address& source,
diff --git a/src/lte/model/lte-enb-net-device.h b/src/lte/model/lte-enb-net-device.h
index 36f2bea29..684fc5199 100644
--- a/src/lte/model/lte-enb-net-device.h
+++ b/src/lte/model/lte-enb-net-device.h
@@ -106,6 +106,12 @@ public:
   void SetDlBandwidth (uint8_t bw);
 
 
+protected:
+
+  // inherited from Object
+  virtual void DoStart (void);
+
+
 private:
   bool DoSend (Ptr<Packet> packet,
                const Mac48Address& source,
diff --git a/src/lte/model/lte-ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc
index 790bba26f..552b022e1 100644
--- a/src/lte/model/lte-ue-net-device.cc
+++ b/src/lte/model/lte-ue-net-device.cc
@@ -79,7 +79,6 @@ LteUeNetDevice::LteUeNetDevice (Ptr<Node> node, Ptr<LteUePhy> phy, Ptr<LteUeMac>
   m_mac = mac;
   m_rrc = rrc;
   SetNode (node);
-  UpdateConfig ();
 }
 
 LteUeNetDevice::~LteUeNetDevice (void)
@@ -151,6 +150,13 @@ LteUeNetDevice::GetTargetEnb (void)
 }
 
 
+void 
+LteUeNetDevice::DoStart (void)
+{
+  UpdateConfig ();
+}
+
+
 bool
 LteUeNetDevice::DoSend (Ptr<Packet> packet, const Mac48Address& source,
                      const Mac48Address& dest, uint16_t protocolNumber)
diff --git a/src/lte/model/lte-ue-net-device.h b/src/lte/model/lte-ue-net-device.h
index e4e12f9fc..543f5893a 100644
--- a/src/lte/model/lte-ue-net-device.h
+++ b/src/lte/model/lte-ue-net-device.h
@@ -81,6 +81,12 @@ public:
   Ptr<LteEnbNetDevice> GetTargetEnb (void);
 
 
+protected:
+
+  // inherited from Object
+  virtual void DoStart (void);
+
+
 private:
   bool DoSend (Ptr<Packet> packet,
                const Mac48Address& source,