--- a/src/devices/wifi/wifi-test.cc	Wed Jun 11 16:19:01 2008 -0700
+++ b/src/devices/wifi/wifi-test.cc	Wed Jun 11 16:19:28 2008 -0700
@@ -1,7 +1,7 @@
 #ifdef RUN_SELF_TESTS
 
 #include "wifi-net-device.h"
-#include "wifi-channel.h"
+#include "yans-wifi-channel.h"
 #include "adhoc-wifi-mac.h"
 #include "yans-wifi-phy.h"
 #include "arf-wifi-manager.h"
@@ -50,7 +50,7 @@
 
   Ptr<WifiMac> mac = m_mac.Create<WifiMac> ();
   Ptr<StaticMobilityModel> mobility = CreateObject<StaticMobilityModel> ();
-  Ptr<WifiPhy> phy = CreateObject<YansWifiPhy> ();
+  Ptr<WifiPhy> phy = channel->CreatePhy (dev, mobility, UnsafeAttributeList ());
   Ptr<WifiRemoteStationManager> manager = m_manager.Create<WifiRemoteStationManager> ();
 
   mobility->SetPosition (pos);
@@ -68,7 +68,7 @@
 void
 WifiTest::RunOne (void)
 {
-  Ptr<WifiChannel> channel = CreateObject<WifiChannel> ();
+  Ptr<YansWifiChannel> channel = CreateObject<YansWifiChannel> ();
   Ptr<PropagationDelayModel> propDelay = m_propDelay.Create<PropagationDelayModel> ();
   Ptr<PropagationLossModel> propLoss = CreateObject<RandomPropagationLossModel> ();
   channel->SetPropagationDelayModel (propDelay);