Merge
authorManuel Requena <manuel.requena@cttc.es>
Thu, 28 Feb 2013 11:51:39 +0100
changeset 9990 7dcc176474af
parent 9987 ae556d123e8f (current diff)
parent 9989 830199200fe3 (diff)
child 9991 3d1c37a99e73
Merge
--- a/src/lte/model/lte-rrc-header.cc	Fri Feb 22 11:26:41 2013 +0100
+++ b/src/lte/model/lte-rrc-header.cc	Thu Feb 28 11:51:39 2013 +0100
@@ -4722,7 +4722,7 @@
 {
   os << "rrcTransactionIdentifier: " << (int) m_rrcTransactionIdentifier << std::endl;
   os << "haveMeasConfig: " << m_haveMeasConfig << std::endl;
-  if (m_haveMobilityControlInfo)
+  if (m_haveMeasConfig)
     {
       if (!m_measConfig.measObjectToRemoveList.empty ())
         {
--- a/src/lte/model/lte-rrc-sap.h	Fri Feb 22 11:26:41 2013 +0100
+++ b/src/lte/model/lte-rrc-sap.h	Thu Feb 28 11:51:39 2013 +0100
@@ -55,8 +55,12 @@
 
   virtual ~LteRrcSap ();
 
+  // Constraint values
+
+  static const uint8_t MaxReportCells = 255;
+
   // Information Elements
-  
+
   struct PlmnIdentityInfo
   {
     uint32_t plmnIdentity;