diff -r 58182a1561cc -r db72c0e7743e src/devices/wifi/wifi-channel.h
--- a/src/devices/wifi/wifi-channel.h	Sat Mar 01 20:41:08 2008 +0100
+++ b/src/devices/wifi/wifi-channel.h	Sat Mar 01 21:21:53 2008 +0100
@@ -26,6 +26,7 @@
 #include "ns3/channel.h"
 #include "wifi-mode.h"
 #include "wifi-preamble.h"
+#include "wifi-phy.h"
 
 namespace ns3 {
 
@@ -83,7 +84,7 @@
    * This method should not be invoked by normal users. It is 
    * currently invoked only from WifiPhy::SetChannel.
    */
-  void Add (Ptr<NetDevice> device,  ReceiveCallback callback);
+  void Add (Ptr<NetDevice> device,  Ptr<WifiPhy> phy);
   /**
    * \param sender the device from which the packet is originating.
    * \param packet the packet to send
@@ -94,11 +95,11 @@
    * This method should not be invoked by normal users. It is 
    * currently invoked only from WifiPhy::Send.
    */
-  void Send (Ptr<NetDevice> sender, Ptr<const Packet> packet, double txPowerDbm,
+  void Send (Ptr<WifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,
              WifiMode wifiMode, WifiPreamble preamble) const;
 
 private:
-  typedef std::vector<std::pair<Ptr<NetDevice>, ReceiveCallback> > DeviceList;
+  typedef std::vector<std::pair<Ptr<NetDevice>, Ptr<WifiPhy> > > DeviceList;
   void Receive (uint32_t i, Ptr<Packet> packet, double rxPowerDbm,
                 WifiMode txMode, WifiPreamble preamble) const;
   /**