--- a/src/devices/wifi/nqap-wifi-mac.cc	Tue Sep 02 11:39:26 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Tue Sep 02 12:00:11 2008 -0700
@@ -147,6 +147,11 @@
   m_dcfManager->SetEifsNoDifs (eifsNoDifs);
   m_eifsNoDifs = eifsNoDifs;
 }
+void 
+NqapWifiMac::SetAckTimeout (Time ackTimeout)
+{
+  m_low->SetAckTimeout (ackTimeout);
+}
 Time 
 NqapWifiMac::GetSlot (void) const
 {
@@ -162,8 +167,11 @@
 {
   return m_eifsNoDifs;
 }
-
-
+Time 
+NqapWifiMac::GetAckTimeout (void) const
+{
+  return m_low->GetAckTimeout ();
+}
 void 
 NqapWifiMac::SetWifiPhy (Ptr<WifiPhy> phy)
 {
@@ -204,7 +212,7 @@
 Mac48Address 
 NqapWifiMac::GetAddress (void) const
 {
-  return m_address;
+  return m_low->GetAddress ();
 }
 Ssid 
 NqapWifiMac::GetSsid (void) const
@@ -220,7 +228,7 @@
 NqapWifiMac::SetAddress (Mac48Address address)
 {
   NS_LOG_FUNCTION (address);
-  m_address = address;
+  m_low->SetAddress (address);
 }
 void 
 NqapWifiMac::SetSsid (Ssid ssid)