From 662f9960032136bae03ce9604dad28e49de3f401 Mon Sep 17 00:00:00 2001
From: Budiarto Herman <budiarto.herman@magister.fi>
Date: Wed, 19 Jun 2013 17:21:22 +0300
Subject: [PATCH] Removed Event A2 and A4 threshold attributes from eNodeB RRC

---
 src/lte/model/lte-enb-rrc.cc | 20 +++++---------------
 src/lte/model/lte-enb-rrc.h  |  4 +---
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc
index 0ee310fa1..cd6937a7d 100644
--- a/src/lte/model/lte-enb-rrc.cc
+++ b/src/lte/model/lte-enb-rrc.cc
@@ -1422,26 +1422,16 @@ LteEnbRrc::GetTypeId (void)
                    TimeValue (MilliSeconds (500)),  
                    MakeTimeAccessor (&LteEnbRrc::m_handoverLeavingTimeoutDuration),
                    MakeTimeChecker ())
-   .AddAttribute ("AdmitHandoverRequest",
+    .AddAttribute ("AdmitHandoverRequest",
                    "Whether to admit an X2 handover request from another eNB",
-                   BooleanValue (true),  
+                   BooleanValue (true),
                    MakeBooleanAccessor (&LteEnbRrc::m_admitHandoverRequest),
-                   MakeBooleanChecker ()) 
-   .AddAttribute ("AdmitRrcConnectionRequest",
+                   MakeBooleanChecker ())
+    .AddAttribute ("AdmitRrcConnectionRequest",
                    "Whether to admit a connection request from a Ue",
-                   BooleanValue (true),  
+                   BooleanValue (true),
                    MakeBooleanAccessor (&LteEnbRrc::m_admitRrcConnectionRequest),
                    MakeBooleanChecker ())
-    .AddAttribute ("EventA2Threshold",
-                   "Threshold of the event A2 (Serving becomes worse than threshold)",
-                   UintegerValue (34),
-                   MakeUintegerAccessor (&LteEnbRrc::m_eventA2Threshold),
-                   MakeUintegerChecker<uint8_t> ())
-    .AddAttribute ("EventA4Threshold",
-                   "Threshold of the event A4 (Neighbour becomes better than threshold)",
-                   UintegerValue (0),
-                   MakeUintegerAccessor (&LteEnbRrc::m_eventA4Threshold),
-                   MakeUintegerChecker<uint8_t> ())
     .AddAttribute ("ServingCellHandoverThreshold",
                    "If serving cell is worse than this threshold, neighbour cells are consider for Handover",
                    UintegerValue (15),
diff --git a/src/lte/model/lte-enb-rrc.h b/src/lte/model/lte-enb-rrc.h
index 0012c3afc..a45f4284e 100644
--- a/src/lte/model/lte-enb-rrc.h
+++ b/src/lte/model/lte-enb-rrc.h
@@ -888,8 +888,6 @@ private:
   // Handover related attributes
   bool m_admitHandoverRequest;
   bool m_admitRrcConnectionRequest;
-  uint8_t m_eventA2Threshold;
-  uint8_t m_eventA4Threshold;
   uint8_t m_servingCellHandoverThreshold;
   uint8_t m_neighbourCellHandoverOffset;
 
@@ -897,7 +895,7 @@ private:
   Time m_connectionTimeoutDuration;
   Time m_connectionRejectedTimeoutDuration;
   Time m_handoverJoiningTimeoutDuration;
-  Time m_handoverLeavingTimeoutDuration;  
+  Time m_handoverLeavingTimeoutDuration;
 
   //       cellid
   std::map<uint16_t, Ptr<NeighbourRelation> > m_neighbourRelationTable;