--- a/src/devices/wifi/adhoc-wifi-mac.h	Tue Sep 02 11:39:26 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.h	Tue Sep 02 12:00:11 2008 -0700
@@ -56,9 +56,11 @@
   virtual void SetSlot (Time slotTime);
   virtual void SetSifs (Time sifs);
   virtual void SetEifsNoDifs (Time eifsNoDifs);
+  virtual void SetAckTimeout (Time ackTimeout);
   virtual Time GetSlot (void) const;
   virtual Time GetSifs (void) const;
   virtual Time GetEifsNoDifs (void) const;
+  virtual Time GetAckTimeout (void) const;
   virtual void SetWifiPhy (Ptr<WifiPhy> phy);
   virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
@@ -86,7 +88,6 @@
   DcfManager *m_dcfManager;
   MacRxMiddle *m_rxMiddle;
   Ptr<MacLow> m_low;
-  Mac48Address m_address;
   Ssid m_ssid;
   Time m_slot;
   Time m_sifs;