diff -r 5c136769b9ad src/lte/model/lte-net-device.cc
--- a/src/lte/model/lte-net-device.cc	Fri Jun 03 11:41:43 2011 +0100
+++ b/src/lte/model/lte-net-device.cc	Fri Jun 03 15:10:15 2011 +0100
@@ -62,6 +62,10 @@
                    PointerValue (),
                    MakePointerAccessor (&LteNetDevice::GetPhy, &LteNetDevice::SetPhy),
                    MakePointerChecker<LtePhy> ())
+
+    .AddTraceSource ("Rx", "Receive trace", MakeTraceSourceAccessor (&LteNetDevice::m_macRxTrace))
+    .AddTraceSource ("Tx", "Transmit trace", MakeTraceSourceAccessor (&LteNetDevice::m_macTxTrace));
+
   ;
   return tid;
 }
@@ -185,12 +189,12 @@
 {
   NS_LOG_FUNCTION (this << packet);
 
-  m_macRxTrace (packet);
-
   LteMacHeader header;
   packet->RemoveHeader (header);
   NS_LOG_LOGIC ("packet " << header.GetSource () << " --> " << header.GetDestination () << " (here: " << m_address << ")");
 
+  m_macRxTrace (packet, header.GetSource ());
+
   LlcSnapHeader llc;
   packet->RemoveHeader (llc);
 
@@ -212,12 +216,14 @@
 {
   NS_LOG_FUNCTION (packet << source << dest << protocolNumber);
 
+  Mac48Address from = Mac48Address::ConvertFrom (source);
+  Mac48Address to = Mac48Address::ConvertFrom (dest);
+
   LlcSnapHeader llcHdr;
   llcHdr.SetType (protocolNumber);
   packet->AddHeader (llcHdr);
 
-  Mac48Address from = Mac48Address::ConvertFrom (source);
-  Mac48Address to = Mac48Address::ConvertFrom (dest);
+  m_macTxTrace (packet, to);
 
   LteMacHeader header;
   header.SetSource (from);
diff -r 5c136769b9ad src/lte/model/lte-net-device.h
--- a/src/lte/model/lte-net-device.h	Fri Jun 03 11:41:43 2011 +0100
+++ b/src/lte/model/lte-net-device.h	Fri Jun 03 15:10:15 2011 +0100
@@ -185,10 +185,10 @@
 
   Ptr<RrcEntity> m_rrcEntity;
 
-  TracedCallback<Ptr<const Packet> > m_macTxTrace;
-  TracedCallback<Ptr<const Packet> > m_macTxDropTrace;
-  TracedCallback<Ptr<const Packet> > m_macPromiscRxTrace;
-  TracedCallback<Ptr<const Packet> > m_macRxTrace;
+  TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macTxTrace;
+  // TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macTxDropTrace;
+  // TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macPromiscRxTrace;
+  TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macRxTrace;
 
   NetDevice::ReceiveCallback m_rxCallback;
   NetDevice::PromiscReceiveCallback m_promiscRxCallback;