--- a/src/devices/wifi/wifi-mac.h	Sat Feb 28 16:25:24 2009 -0800
+++ b/src/devices/wifi/wifi-mac.h	Tue Mar 10 23:47:55 2009 -0700
@@ -177,11 +177,29 @@
    */
   virtual void SetLinkDownCallback (Callback<void> linkDown) = 0;
 
-  /*
-   * Let the net device hit a trace hook.  This is done to group the high-level
-   * trace sources all in one place for ease of use.
+  /**
+   * Public method used to fire a MacTx trace.  Implemented for encapsulation 
+   * purposes.
+   */
+  void NotifyTx (Ptr<const Packet> packet);
+
+  /**
+   * Public method used to fire a MacTxDrop trace.  Implemented for encapsulation 
+   * purposes.
    */
-  void SnifferTrace (Ptr<const Packet> packet);
+  void NotifyTxDrop (Ptr<const Packet> packet);
+
+  /**
+   * Public method used to fire a MacRx trace.  Implemented for encapsulation 
+   * purposes.
+   */
+  void NotifyRx (Ptr<const Packet> packet);
+
+  /**
+   * Public method used to fire a MacRxDrop trace.  Implemented for encapsulation 
+   * purposes.
+   */
+  void NotifyRxDrop (Ptr<const Packet> packet);
 
 private:
   static Time GetDefaultMaxPropagationDelay (void);
@@ -194,8 +212,6 @@
   Time m_maxPropagationDelay;
   uint32_t m_maxMsduSize;
 
-protected:
-
   /**
    * The trace source fired when packets come into the "top" of the device
    * at the L3/L2 transition, before being queued for transmission.
@@ -229,25 +245,6 @@
    */
   TracedCallback<Ptr<const Packet> > m_macRxDropTrace;
 
-  /**
-   * A trace source that emulates a non-promiscuous protocol sniffer connected 
-   * to the device.  Unlike your average everyday sniffer, this trace source 
-   * will not fire on PACKET_OTHERHOST events.
-   *
-   * On the transmit size, this trace hook will fire after a packet is dequeued
-   * from the device queue for transmission.  In Linux, for example, this would
-   * correspond to the point just before a device hard_start_xmit where 
-   * dev_queue_xmit_nit is called to dispatch the packet to the PF_PACKET 
-   * ETH_P_ALL handlers.
-   *
-   * On the receive side, this trace hook will fire when a packet is received,
-   * just before the receive callback is executed.  In Linux, for example, 
-   * this would correspond to the point at which the packet is dispatched to 
-   * packet sniffers in netif_receive_skb.
-   *
-   * \see class CallBackTraceSource
-   */
-  TracedCallback<Ptr<const Packet> > m_snifferTrace;
 };
 
 } // namespace ns3