# HG changeset patch
# User Tommaso Pecorella <tommaso.pecorella@unifi.it>
# Date 1500132935 -7200
# Parent  b9a2e11a567e7e2d2ee3706cca9ad525f21ae5c8
LteUeNetDevice has a null MAC address

diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc
--- a/src/lte/helper/lte-helper.cc
+++ b/src/lte/helper/lte-helper.cc
@@ -924,6 +924,9 @@
   dev->SetAttribute ("LteUeRrc", PointerValue (rrc));
   dev->SetAttribute ("EpcUeNas", PointerValue (nas));
   dev->SetAttribute ("LteUeComponentCarrierManager", PointerValue (ccmUe));
+  // \todo The UE identifier should be dynamically set by the EPC
+  // when the default PDP context is created. This is a simplification.
+  dev->SetAddress (Mac64Address::Allocate ());
 
   for (std::map<uint8_t, Ptr<ComponentCarrierUe> >::iterator it = ueCcMap.begin (); it != ueCcMap.end (); ++it)
     {
diff --git a/src/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc
--- a/src/lte/model/lte-net-device.cc
+++ b/src/lte/model/lte-net-device.cc
@@ -98,7 +98,7 @@
 LteNetDevice::SetAddress (Address address)
 {
   NS_LOG_FUNCTION (this << address);
-  m_address = Mac48Address::ConvertFrom (address);
+  m_address = Mac64Address::ConvertFrom (address);
 }
 
 
diff --git a/src/lte/model/lte-net-device.h b/src/lte/model/lte-net-device.h
--- a/src/lte/model/lte-net-device.h
+++ b/src/lte/model/lte-net-device.h
@@ -24,7 +24,7 @@
 
 #include <ns3/net-device.h>
 #include <ns3/event-id.h>
-#include <ns3/mac48-address.h>
+#include <ns3/mac64-address.h>
 #include <ns3/traced-callback.h>
 #include <ns3/nstime.h>
 #include <ns3/lte-phy.h>
@@ -112,7 +112,7 @@
   bool m_linkUp; ///< link uo
   mutable uint16_t m_mtu; ///< MTU
 
-  Mac48Address m_address; ///< MAC address
+  Mac64Address m_address; ///< MAC address - only relevant for UEs.
 };
 
 
diff --git a/src/lte/model/lte-ue-net-device.h b/src/lte/model/lte-ue-net-device.h
--- a/src/lte/model/lte-ue-net-device.h
+++ b/src/lte/model/lte-ue-net-device.h
@@ -27,7 +27,6 @@
 
 #include "ns3/lte-net-device.h"
 #include "ns3/event-id.h"
-#include "ns3/mac48-address.h"
 #include "ns3/traced-callback.h"
 #include "ns3/nstime.h"
 #include "ns3/lte-phy.h"