--- a/src/devices/wifi/wifi-net-device.cc	Sat Feb 28 16:25:24 2009 -0800
+++ b/src/devices/wifi/wifi-net-device.cc	Tue Mar 10 23:47:55 2009 -0700
@@ -248,8 +248,6 @@
   Mac48Address realTo = Mac48Address::ConvertFrom (dest);
   Mac48Address realFrom = Mac48Address::ConvertFrom (GetAddress ());
 
-  SniffPacket (packet, realTo, realFrom, protocolNumber);
-
   LlcSnapHeader llc;
   llc.SetType (protocolNumber);
   packet->AddHeader (llc);
@@ -307,7 +305,6 @@
 
   if (type != NetDevice::PACKET_OTHERHOST)
     {
-      SniffPacket (packet, to, from, llc.GetType ());
       m_forwardUp (this, packet, llc.GetType (), from);
     }
 
@@ -345,8 +342,6 @@
   Mac48Address realTo = Mac48Address::ConvertFrom (dest);
   Mac48Address realFrom = Mac48Address::ConvertFrom (source);
 
-  SniffPacket (packet, realTo, realFrom, protocolNumber);
-
   LlcSnapHeader llc;
   llc.SetType (protocolNumber);
   packet->AddHeader (llc);
@@ -370,26 +365,5 @@
   return m_mac->SupportsSendFrom ();
 }
 
-void
-WifiNetDevice::SniffPacket (Ptr<const Packet> packet, Mac48Address to, Mac48Address from, uint16_t type)
-{
-  Ptr<Packet> copy = packet->Copy ();
-  EthernetHeader header (false);
-  header.SetSource (from);
-  header.SetDestination (to);
-
-  LlcSnapHeader llc;
-  llc.SetType (type);
-  copy->AddHeader (llc);
-
-  header.SetLengthType (copy->GetSize ());
-  copy->AddHeader (header);
-
-  EthernetTrailer trailer;
-  trailer.CalcFcs (copy);
-  copy->AddTrailer (trailer);
-  m_mac->SnifferTrace (copy);
-}
-
 } // namespace ns3