Attachment #2891 for bug #2768

View | Details | Raw Unified | Return to bug 2768
Collapse All | Expand All

(-)a/src/lte/helper/lte-helper.cc (+3 lines)

Lines 924-929	Link Here

924

  dev->SetAttribute ("LteUeRrc", PointerValue (rrc));

924

  dev->SetAttribute ("LteUeRrc", PointerValue (rrc));

925

  dev->SetAttribute ("EpcUeNas", PointerValue (nas));

925

  dev->SetAttribute ("EpcUeNas", PointerValue (nas));

926

  dev->SetAttribute ("LteUeComponentCarrierManager", PointerValue (ccmUe));

926

  dev->SetAttribute ("LteUeComponentCarrierManager", PointerValue (ccmUe));

927

  // \todo The UE identifier should be dynamically set by the EPC

928

  // when the default PDP context is created. This is a simplification.

929

  dev->SetAddress (Mac64Address::Allocate ());

927

930

928

  for (std::map<uint8_t, Ptr<ComponentCarrierUe> >::iterator it = ueCcMap.begin (); it != ueCcMap.end (); ++it)

931

  for (std::map<uint8_t, Ptr<ComponentCarrierUe> >::iterator it = ueCcMap.begin (); it != ueCcMap.end (); ++it)

929

932

(-)a/src/lte/model/lte-net-device.cc (-1 / +1 lines)

Lines 98-104	Link Here

LteNetDevice::SetAddress (Address address)

LteNetDevice::SetAddress (Address address)

100

  NS_LOG_FUNCTION (this << address);

100

  NS_LOG_FUNCTION (this << address);

101

  m_address = Mac48Address::ConvertFrom (address);

101

  m_address = Mac64Address::ConvertFrom (address);

102

103

104

(-)a/src/lte/model/lte-net-device.h (-2 / +2 lines)

Lines 24-30	Link Here

#include <ns3/net-device.h>

#include <ns3/net-device.h>

#include <ns3/event-id.h>

#include <ns3/event-id.h>

#include <ns3/mac48-address.h>

#include <ns3/mac64-address.h>

#include <ns3/traced-callback.h>

#include <ns3/traced-callback.h>

#include <ns3/nstime.h>

#include <ns3/nstime.h>

#include <ns3/lte-phy.h>

#include <ns3/lte-phy.h>

Lines 112-118	Link Here

112

  bool m_linkUp; ///< link uo

112

  bool m_linkUp; ///< link uo

113

  mutable uint16_t m_mtu; ///< MTU

113

  mutable uint16_t m_mtu; ///< MTU

114

115

  Mac48Address m_address; ///< MAC address

115

  Mac64Address m_address; ///< MAC address - only relevant for UEs.

116

};

116

};

117

118

(-)a/src/lte/model/lte-ue-net-device.h (-1 lines)

Lines 27-33	Link Here

#include "ns3/lte-net-device.h"

#include "ns3/lte-net-device.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "ns3/mac48-address.h"

#include "ns3/traced-callback.h"

#include "ns3/traced-callback.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/lte-phy.h"

#include "ns3/lte-phy.h"

Return to bug 2768