--- a/src/devices/wifi/dca-txop.cc	Fri Feb 22 23:28:01 2008 +0100
+++ b/src/devices/wifi/dca-txop.cc	Fri Feb 22 23:34:53 2008 +0100
@@ -35,6 +35,7 @@
 #include "mac-stations.h"
 #include "wifi-phy.h"
 #include "random-stream.h"
+#include "ns3/composite-trace-resolver.h"
 
 NS_LOG_COMPONENT_DEFINE ("DcaTxop");
 
@@ -125,7 +126,7 @@
 }
 
 void 
-DcaTxop::SetLow (MacLow *low)
+DcaTxop::SetLow (Ptr<MacLow> low)
 {
   m_low = low;
 }
@@ -206,7 +207,7 @@
 }
 
 
-MacLow *
+Ptr<MacLow>
 DcaTxop::Low (void)
 {
   return m_low;
@@ -530,4 +531,21 @@
    */
 }
 
+Ptr<TraceResolver> 
+DcaTxop::GetTraceResolver (void) const
+{
+  Ptr<CompositeTraceResolver> resolver =
+    Create<CompositeTraceResolver> ();
+  resolver->AddSource ("ackTimeout",
+                       TraceDoc ("ACK timeout",
+                                 "uint32_t", "Number of transmission attemps"),
+                       m_acktimeoutTrace);
+  resolver->AddSource ("ctsTimeout",
+                       TraceDoc ("CTS timeout",
+                                 "uint32_t", "Number of transmission attemps"),
+                       m_ctstimeoutTrace);
+  resolver->SetParentResolver (Object::GetTraceResolver ());
+  return resolver;
+}
+
 } // namespace ns3