--- a/src/devices/wifi/adhoc-wifi-mac.cc	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.cc	Fri Mar 21 12:56:33 2008 -0700
@@ -80,19 +80,34 @@
 AdhocWifiMac::SetSlot (Time slotTime)
 {
   m_dcfManager->SetSlot (slotTime);
-  WifiMac::SetSlot (slotTime);
+  m_slot = slotTime;
 }
 void 
 AdhocWifiMac::SetSifs (Time sifs)
 {
   m_dcfManager->SetSifs (sifs);
-  WifiMac::SetSifs (sifs);
+  m_sifs = sifs;
 }
 void 
 AdhocWifiMac::SetEifsNoDifs (Time eifsNoDifs)
 {
   m_dcfManager->SetEifsNoDifs (eifsNoDifs);
-  WifiMac::SetEifsNoDifs (eifsNoDifs);
+  m_eifsNoDifs = eifsNoDifs;
+}
+Time 
+AdhocWifiMac::GetSlot (void) const
+{
+  return m_slot;
+}
+Time 
+AdhocWifiMac::GetSifs (void) const
+{
+  return m_sifs;
+}
+Time 
+AdhocWifiMac::GetEifsNoDifs (void) const
+{
+  return m_eifsNoDifs;
 }
 
 void 

--- a/src/devices/wifi/adhoc-wifi-mac.h	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.h	Fri Mar 21 12:56:33 2008 -0700
@@ -56,6 +56,9 @@
   virtual void SetSlot (Time slotTime);
   virtual void SetSifs (Time sifs);
   virtual void SetEifsNoDifs (Time eifsNoDifs);
+  virtual Time GetSlot (void) const;
+  virtual Time GetSifs (void) const;
+  virtual Time GetEifsNoDifs (void) const;
   virtual void SetWifiPhy (Ptr<WifiPhy> phy);
   virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
@@ -84,6 +87,9 @@
   Ptr<MacLow> m_low;
   Mac48Address m_address;
   Ssid m_ssid;
+  Time m_slot;
+  Time m_sifs;
+  Time m_eifsNoDifs;
 };
 
 } // namespace ns3

--- a/src/devices/wifi/nqap-wifi-mac.cc	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Fri Mar 21 12:56:33 2008 -0700
@@ -122,20 +122,36 @@
 NqapWifiMac::SetSlot (Time slotTime)
 {
   m_dcfManager->SetSlot (slotTime);
-  WifiMac::SetSlot (slotTime);
+  m_slot = slotTime;
 }
 void 
 NqapWifiMac::SetSifs (Time sifs)
 {
   m_dcfManager->SetSifs (sifs);
-  WifiMac::SetSifs (sifs);
+  m_sifs = sifs;
 }
 void 
 NqapWifiMac::SetEifsNoDifs (Time eifsNoDifs)
 {
   m_dcfManager->SetEifsNoDifs (eifsNoDifs);
-  WifiMac::SetEifsNoDifs (eifsNoDifs);
+  m_eifsNoDifs = eifsNoDifs;
+}
+Time 
+NqapWifiMac::GetSlot (void) const
+{
+  return m_slot;
 }
+Time 
+NqapWifiMac::GetSifs (void) const
+{
+  return m_sifs;
+}
+Time 
+NqapWifiMac::GetEifsNoDifs (void) const
+{
+  return m_eifsNoDifs;
+}
+
 
 void 
 NqapWifiMac::SetWifiPhy (Ptr<WifiPhy> phy)

--- a/src/devices/wifi/nqap-wifi-mac.h	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.h	Fri Mar 21 12:56:33 2008 -0700
@@ -62,6 +62,9 @@
   virtual void SetSlot (Time slotTime);
   virtual void SetSifs (Time sifs);
   virtual void SetEifsNoDifs (Time eifsNoDifs);
+  virtual Time GetSlot (void) const;
+  virtual Time GetSifs (void) const;
+  virtual Time GetEifsNoDifs (void) const;
   virtual void SetWifiPhy (Ptr<WifiPhy> phy);
   virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
@@ -115,6 +118,9 @@
   Mac48Address m_address;
   Ssid m_ssid;
   EventId m_beaconEvent;
+  Time m_slot;
+  Time m_sifs;
+  Time m_eifsNoDifs;
 };
 
 } // namespace ns3

--- a/src/devices/wifi/nqsta-wifi-mac.cc	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Fri Mar 21 12:56:33 2008 -0700
@@ -129,19 +129,34 @@
 NqstaWifiMac::SetSlot (Time slotTime)
 {
   m_dcfManager->SetSlot (slotTime);
-  WifiMac::SetSlot (slotTime);
+  m_slot = slotTime;
 }
 void 
 NqstaWifiMac::SetSifs (Time sifs)
 {
   m_dcfManager->SetSifs (sifs);
-  WifiMac::SetSifs (sifs);
+  m_sifs = sifs;
 }
 void 
 NqstaWifiMac::SetEifsNoDifs (Time eifsNoDifs)
 {
   m_dcfManager->SetEifsNoDifs (eifsNoDifs);
-  WifiMac::SetEifsNoDifs (eifsNoDifs);
+  m_eifsNoDifs = eifsNoDifs;
+}
+Time 
+NqstaWifiMac::GetSlot (void) const
+{
+  return m_slot;
+}
+Time 
+NqstaWifiMac::GetSifs (void) const
+{
+  return m_sifs;
+}
+Time 
+NqstaWifiMac::GetEifsNoDifs (void) const
+{
+  return m_eifsNoDifs;
 }
 
 void 

--- a/src/devices/wifi/nqsta-wifi-mac.h	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/nqsta-wifi-mac.h	Fri Mar 21 12:56:33 2008 -0700
@@ -62,6 +62,9 @@
   virtual void SetSlot (Time slotTime);
   virtual void SetSifs (Time sifs);
   virtual void SetEifsNoDifs (Time eifsNoDifs);
+  virtual Time GetSlot (void) const;
+  virtual Time GetSifs (void) const;
+  virtual Time GetEifsNoDifs (void) const;
   virtual void SetWifiPhy (Ptr<WifiPhy> phy);
   virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
@@ -145,6 +148,9 @@
   Ptr<MacLow> m_low;
   Mac48Address m_address;
   Ssid m_ssid;
+  Time m_slot;
+  Time m_sifs;
+  Time m_eifsNoDifs;
 };
 
 } // namespace ns3

--- a/src/devices/wifi/wifi-mac.cc	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/wifi-mac.cc	Fri Mar 21 12:56:33 2008 -0700
@@ -117,21 +117,6 @@
   return tid;
 }
 
-void 
-WifiMac::SetSlot (Time slotTime)
-{
-  m_slot = slotTime;
-}
-void
-WifiMac::SetEifsNoDifs (Time eifsNoDifs)
-{
-  m_eifsNoDifs = eifsNoDifs;
-}
-void
-WifiMac::SetSifs (Time sifs)
-{
-  m_sifs = sifs;
-}
 void
 WifiMac::SetPifs (Time pifs)
 {
@@ -158,21 +143,6 @@
   return m_pifs;
 }
 Time
-WifiMac::GetSifs (void) const
-{
-  return m_sifs;
-}
-Time
-WifiMac::GetSlot (void) const
-{
-  return m_slot;
-}
-Time 
-WifiMac::GetEifsNoDifs (void) const
-{
-  return m_eifsNoDifs;
-}
-Time
 WifiMac::GetCtsTimeout (void) const
 {
   return m_ctsTimeout;

--- a/src/devices/wifi/wifi-mac.h	Fri Mar 21 12:34:11 2008 -0700
+++ b/src/devices/wifi/wifi-mac.h	Fri Mar 21 12:56:33 2008 -0700
@@ -45,18 +45,18 @@
   /**
    * \param slotTime the slot duration
    */
-  virtual void SetSlot (Time slotTime);
+  virtual void SetSlot (Time slotTime) = 0;
   /**
    * \param sifs the sifs duration
    */
-  virtual void SetSifs (Time sifs);
+  virtual void SetSifs (Time sifs) = 0;
   /**
    * \param eifsNoDifs the duration of an EIFS minus DIFS.
    *
    * This value is used to calculate the EIFS depending
    * on AIFSN.
    */
-  virtual void SetEifsNoDifs (Time eifsNoDifs);
+  virtual void SetEifsNoDifs (Time eifsNoDifs) = 0;
   /**
    * \param pifs the pifs duration.
    */
@@ -87,15 +87,15 @@
   /**
    * \returns the current SIFS duration.
    */
-  Time GetSifs (void) const;
+  virtual Time GetSifs (void) const = 0;
   /**
    * \returns the current slot duration.
    */
-  Time GetSlot (void) const;
+  virtual Time GetSlot (void) const = 0;
   /**
    * \returns the current EIFS minus DIFS duration
    */
-  Time GetEifsNoDifs (void) const;
+  virtual Time GetEifsNoDifs (void) const = 0;
   /**
    * \returns the current CTS timeout duration.
    */