--- a/src/devices/wifi/nqsta-wifi-mac.cc	Sat Feb 28 16:25:24 2009 -0800
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Tue Mar 10 23:47:55 2009 -0700
@@ -322,7 +322,7 @@
 NqstaWifiMac::ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to)
 {
   NS_LOG_FUNCTION (this << packet << from << to);
-  m_macRxTrace (packet);
+  NotifyRx (packet);
   m_forwardUp (packet, from, to);
 }
 void
@@ -468,7 +468,7 @@
   NS_LOG_FUNCTION (this << packet << to);
   if (!IsAssociated ()) 
     {
-      m_macTxDropTrace (packet);
+      NotifyTxDrop (packet);
       TryToEnsureAssociated ();
       return;
     }
@@ -481,7 +481,7 @@
   hdr.SetDsNotFrom ();
   hdr.SetDsTo ();
 
-  m_macTxTrace (packet);
+  NotifyTx (packet);
   m_dca->Queue (packet, hdr);
 }
 
@@ -509,26 +509,26 @@
            !hdr->GetAddr1 ().IsGroup ()) 
     {
       NS_LOG_LOGIC ("packet is not for us");
-      m_macRxDropTrace (packet);
+      NotifyRxDrop (packet);
     } 
   else if (hdr->IsData ()) 
     {
       if (!IsAssociated ())
         {
           NS_LOG_LOGIC ("Received data frame while not associated: ignore");
-          m_macRxDropTrace (packet);
+          NotifyRxDrop (packet);
           return;
         }
       if (!(hdr->IsFromDs () && !hdr->IsToDs ()))
         {
           NS_LOG_LOGIC ("Received data frame not from the DS: ignore");
-          m_macRxDropTrace (packet);
+          NotifyRxDrop (packet);
           return;
         }
       if (hdr->GetAddr2 () != GetBssid ())
         {
           NS_LOG_LOGIC ("Received data frame not from the the BSS we are associated with: ignore");
-          m_macRxDropTrace (packet);
+          NotifyRxDrop (packet);
           return;
         }
 
@@ -540,7 +540,7 @@
       /* this is a frame aimed at an AP.
        * so we can safely ignore it.
        */
-      m_macRxDropTrace (packet);
+      NotifyRxDrop (packet);
     } 
   else if (hdr->IsBeacon ()) 
     {