--- a/src/devices/wifi/nqap-wifi-mac.cc	Wed Feb 25 12:27:00 2009 -0500
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Sat Feb 28 16:25:24 2009 -0800
@@ -30,6 +30,7 @@
 #include "dcf-manager.h"
 #include "mac-rx-middle.h"
 #include "mac-low.h"
+#include "wifi-mac-trailer.h"
 #include "ns3/pointer.h"
 
 NS_LOG_COMPONENT_DEFINE ("NqapWifiMac");
@@ -285,8 +286,10 @@
 NqapWifiMac::ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to)
 {
   NS_LOG_FUNCTION (this << packet << from);
+  m_macRxTrace (packet);
   m_upCallback (packet, from, to);
 }
+
 void 
 NqapWifiMac::ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to)
 {
@@ -298,6 +301,8 @@
   hdr.SetAddr3 (from);
   hdr.SetDsFrom ();
   hdr.SetDsNotTo ();
+
+  m_macTxTrace (packet);
   m_dca->Queue (packet, hdr);  
 }
 void 
@@ -472,11 +477,13 @@
         {
           // this is an AP-to-AP frame
           // we ignore for now.
+          m_macRxDropTrace (packet);
         } 
       else 
         {
           // we can ignore these frames since 
           // they are not targeted at the AP
+          m_macRxDropTrace (packet);
         }
     } 
   else if (hdr->IsMgt ())