--- a/src/devices/wifi/adhoc-wifi-mac.cc	Thu May 28 11:07:41 2009 +0200
+++ b/src/devices/wifi/adhoc-wifi-mac.cc	Thu May 28 17:49:38 2009 +0200
@@ -98,7 +98,6 @@
 AdhocWifiMac::SetEifsNoDifs (Time eifsNoDifs)
 {
   m_dcfManager->SetEifsNoDifs (eifsNoDifs);
-  m_eifsNoDifs = eifsNoDifs;
 }
 void 
 AdhocWifiMac::SetAckTimeout (Time ackTimeout)
@@ -128,7 +127,7 @@
 Time 
 AdhocWifiMac::GetEifsNoDifs (void) const
 {
-  return m_eifsNoDifs;
+  return m_dcfManager->GetEifsNoDifs ();
 }
 Time 
 AdhocWifiMac::GetAckTimeout (void) const
@@ -241,7 +240,7 @@
 }
 
 void 
-AdhocWifiMac::ForwardUp (Ptr<Packet> packet, WifiMacHeader const *hdr)
+AdhocWifiMac::ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_DEBUG ("received size="<<packet->GetSize ()<<", from="<<hdr->GetAddr2 ());
   m_upCallback (packet, hdr->GetAddr2 (), hdr->GetAddr1 ());