--- a/src/devices/wifi/wifi-mac-queue.cc	Thu Nov 22 10:44:48 2007 +0100
+++ b/src/devices/wifi/wifi-mac-queue.cc	Thu Nov 22 14:27:22 2007 +0100
@@ -27,9 +27,9 @@
 
 namespace ns3 {
 
-WifiMacQueue::Item::Item (Packet packet, 
-                            WifiMacHeader const &hdr, 
-                            Time tstamp)
+WifiMacQueue::Item::Item (Ptr<const Packet> packet, 
+                          WifiMacHeader const &hdr, 
+                          Time tstamp)
   : packet (packet), hdr (hdr), tstamp (tstamp)
 {}
 
@@ -53,7 +53,7 @@
   m_maxDelay = delay;
 }
 void 
-WifiMacQueue::Enqueue (Packet packet, WifiMacHeader const &hdr)
+WifiMacQueue::Enqueue (Ptr<const Packet> packet, WifiMacHeader const &hdr)
 {
   Cleanup ();
   if (m_size == m_maxSize) 
@@ -88,8 +88,8 @@
   m_queue.erase (m_queue.begin (), end);
 }
 
-Packet 
-WifiMacQueue::Dequeue (WifiMacHeader *hdr, bool *found)
+Ptr<const Packet>
+WifiMacQueue::Dequeue (WifiMacHeader *hdr)
 {
   Cleanup ();
   if (!m_queue.empty ()) 
@@ -98,11 +98,9 @@
       m_queue.pop_front ();
       m_size--;
       *hdr = i.hdr;
-      *found = true;
       return i.packet;
     }
-  *found = false;
-  return Packet ();
+  return 0;
 }