From 18a087866c7248a3cecaedcc838bbcd75945a36b Mon Sep 17 00:00:00 2001
From: Zoraze Ali <zoraze.ali@cttc.es>
Date: Thu, 6 Sep 2018 14:05:17 +0200
Subject: [PATCH] lte: eNB CCM should not have a direct pointer to the eNB RRC

---
 src/lte/helper/lte-helper.cc                       | 1 -
 src/lte/model/lte-enb-component-carrier-manager.cc | 6 ------
 src/lte/model/lte-enb-component-carrier-manager.h  | 5 -----
 3 files changed, 12 deletions(-)

diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc
index 9c4ae49e5..6bfc4a3e8 100644
--- a/src/lte/helper/lte-helper.cc
+++ b/src/lte/helper/lte-helper.cc
@@ -597,7 +597,6 @@ LteHelper::InstallSingleEnbDevice (Ptr<Node> n)
   // Set number of component carriers. Note: eNB CCM would also set the
   // number of component carriers in eNB RRC
   ccmEnbManager->SetNumberOfComponentCarriers (m_noOfCcs);
-  ccmEnbManager->SetRrc(rrc);
 
   rrc->ConfigureCarriers (ccMap);
 
diff --git a/src/lte/model/lte-enb-component-carrier-manager.cc b/src/lte/model/lte-enb-component-carrier-manager.cc
index ac8151e06..bf4c7bf8a 100644
--- a/src/lte/model/lte-enb-component-carrier-manager.cc
+++ b/src/lte/model/lte-enb-component-carrier-manager.cc
@@ -130,10 +130,4 @@ LteEnbComponentCarrierManager::SetNumberOfComponentCarriers (uint16_t noOfCompon
   m_ccmRrcSapUser->SetNumberOfComponentCarriers (noOfComponentCarriers);
 }
 
-void
-LteEnbComponentCarrierManager::SetRrc (const Ptr<LteEnbRrc> rrc)
-{
-  m_rrc = rrc;
-}
-
 } // end of namespace ns3
diff --git a/src/lte/model/lte-enb-component-carrier-manager.h b/src/lte/model/lte-enb-component-carrier-manager.h
index 216e0e82b..d2951da8a 100644
--- a/src/lte/model/lte-enb-component-carrier-manager.h
+++ b/src/lte/model/lte-enb-component-carrier-manager.h
@@ -151,11 +151,6 @@ public:
    */
   virtual void SetNumberOfComponentCarriers (uint16_t noOfComponentCarriers);
 
-  /**
-   * \brief Sets a pointer to eNodeB RRC instance
-   * \param rrc the RRC
-   */
-  virtual void SetRrc (const Ptr<LteEnbRrc> rrc);
 
 protected: