--- a/src/devices/wifi/wifi-phy.cc	Wed Mar 19 10:32:06 2008 -0700
+++ b/src/devices/wifi/wifi-phy.cc	Wed Mar 19 11:10:02 2008 -0700
@@ -235,6 +235,14 @@
     .AddTraceSource ("State",
                      "The WifiPhy state",
                      MakeTraceSourceAccessor (&WifiPhy::m_stateLogger))
+    .AddTraceSource ("RxOk",
+                     "A packet has been received successfully.",
+                     MakeTraceSourceAccessor (&WifiPhy::m_syncOkCallback))
+    .AddTraceSource ("RxError",
+                     "A packet has been received unsuccessfully.",
+                     MakeTraceSourceAccessor (&WifiPhy::m_syncErrorCallback))
+    .AddTraceSource ("Tx", "Packet transmission is starting.",
+                     MakeTraceSourceAccessor (&WifiPhy::m_txCallback))
     ;
   return tid;
 }
@@ -363,12 +371,12 @@
 void 
 WifiPhy::SetReceiveOkCallback (SyncOkCallback callback)
 {
-  m_syncOkCallback = callback;
+  m_syncOkCallback.ConnectWithoutContext (callback);
 }
 void 
 WifiPhy::SetReceiveErrorCallback (SyncErrorCallback callback)
 {
-  m_syncErrorCallback = callback;
+  m_syncErrorCallback.ConnectWithoutContext (callback);
 }
 void 
 WifiPhy::StartReceivePacket (Ptr<Packet> packet, 
@@ -472,6 +480,7 @@
    */
   NS_ASSERT (!IsStateTx ());
 
+  m_txCallback (packet, txMode, preamble, txPower);
   Time txDuration = CalculateTxDuration (packet->GetSize (), txMode, preamble);
   NotifyTxStart (txDuration);
   SwitchToTx (txDuration);