--- a/src/wifi/model/mac-low.cc	Sun Jul 10 08:55:21 2011 -0400
+++ b/src/wifi/model/mac-low.cc	Sat Jul 16 08:54:00 2011 -0400
@@ -581,7 +581,7 @@
 }
 
 void
-MacLow::SetRxCallback (Callback<void,Ptr<Packet>,const WifiMacHeader *,RadiotapHeader> callback)
+MacLow::SetRxCallback (Callback<void,Ptr<Packet>,const WifiMacHeader *,const RadiotapHeader *> callback)
 {
   m_rxCallback = callback;
 }
@@ -678,7 +678,7 @@
    */
   WifiMacHeader hdr;
   packet->RemoveHeader (hdr);
-  m_currentRadiotapHdr = radiotaphdr;
+  m_currentRadiotapHdr = &radiotaphdr;
 
   bool isPrevNavZero = IsNavZero ();
   NS_LOG_DEBUG ("duration/id=" << hdr.GetDuration ());
@@ -929,7 +929,7 @@
 rxPacket:
   WifiMacTrailer fcs;
   packet->RemoveTrailer (fcs);
-  m_rxCallback (packet, &hdr, radiotaphdr);
+  m_rxCallback (packet, &hdr, &radiotaphdr);
   return;
 }