--- a/src/devices/wifi/adhoc-wifi-mac.cc	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.cc	Tue Sep 02 12:13:24 2008 -0700
@@ -86,7 +86,7 @@
 AdhocWifiMac::SetSifs (Time sifs)
 {
   m_dcfManager->SetSifs (sifs);
-  m_sifs = sifs;
+  m_low->SetSifs (sifs);
 }
 void 
 AdhocWifiMac::SetEifsNoDifs (Time eifsNoDifs)
@@ -112,7 +112,7 @@
 Time 
 AdhocWifiMac::GetSifs (void) const
 {
-  return m_sifs;
+  return m_low->GetSifs ();
 }
 Time 
 AdhocWifiMac::GetEifsNoDifs (void) const

--- a/src/devices/wifi/adhoc-wifi-mac.h	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/adhoc-wifi-mac.h	Tue Sep 02 12:13:24 2008 -0700
@@ -92,7 +92,6 @@
   Ptr<MacLow> m_low;
   Ssid m_ssid;
   Time m_slot;
-  Time m_sifs;
   Time m_eifsNoDifs;
 };
 

--- a/src/devices/wifi/mac-low.cc	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/mac-low.cc	Tue Sep 02 12:13:24 2008 -0700
@@ -372,6 +372,11 @@
 {
   m_ctsTimeout = ctsTimeout;
 }
+void
+MacLow::SetSifs (Time sifs)
+{
+  m_sifs = sifs;
+}
 Mac48Address 
 MacLow::GetAddress (void) const
 {
@@ -387,6 +392,11 @@
 {
   return m_ctsTimeout;
 }
+Time
+MacLow::GetSifs (void) const
+{
+  return m_sifs;
+}
 
 void 
 MacLow::SetRxCallback (Callback<void,Ptr<Packet>,const WifiMacHeader *> callback)
@@ -642,11 +652,6 @@
   return cts.GetSize () + 4;
 }
 Time
-MacLow::GetSifs (void) const
-{
-  return m_mac->GetSifs ();
-}
-Time
 MacLow::GetSlotTime (void) const
 {
   return m_mac->GetSlot ();

--- a/src/devices/wifi/mac-low.h	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/mac-low.h	Tue Sep 02 12:13:24 2008 -0700
@@ -287,9 +287,11 @@
   void SetAddress (Mac48Address ad);
   void SetAckTimeout (Time ackTimeout);
   void SetCtsTimeout (Time ctsTimeout);
+  void SetSifs (Time sifs);
   Mac48Address GetAddress (void) const;
   Time GetAckTimeout (void) const;
   Time GetCtsTimeout (void) const;
+  Time GetSifs (void) const;
 
   /**
    * \param callback the callback which receives every incoming packet.
@@ -353,7 +355,6 @@
   uint32_t GetAckSize (void) const;
   uint32_t GetRtsSize (void) const;
   uint32_t GetCtsSize (void) const;
-  Time GetSifs (void) const;
   Time GetPifs (void) const;
   Time GetSlotTime (void) const;
   uint32_t GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
@@ -419,6 +420,7 @@
   Mac48Address m_self;
   Time m_ackTimeout;
   Time m_ctsTimeout;
+  Time m_sifs;
 
   Time m_lastNavStart;
   Time m_lastNavDuration;

--- a/src/devices/wifi/nqap-wifi-mac.cc	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Tue Sep 02 12:13:24 2008 -0700
@@ -138,7 +138,7 @@
 {
   NS_LOG_FUNCTION (this << sifs);
   m_dcfManager->SetSifs (sifs);
-  m_sifs = sifs;
+  m_low->SetSifs (sifs);
 }
 void 
 NqapWifiMac::SetEifsNoDifs (Time eifsNoDifs)
@@ -165,7 +165,7 @@
 Time 
 NqapWifiMac::GetSifs (void) const
 {
-  return m_sifs;
+  return m_low->GetSifs ();
 }
 Time 
 NqapWifiMac::GetEifsNoDifs (void) const

--- a/src/devices/wifi/nqap-wifi-mac.h	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/nqap-wifi-mac.h	Tue Sep 02 12:13:24 2008 -0700
@@ -124,7 +124,6 @@
   Ssid m_ssid;
   EventId m_beaconEvent;
   Time m_slot;
-  Time m_sifs;
   Time m_eifsNoDifs;
 };
 

--- a/src/devices/wifi/nqsta-wifi-mac.cc	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Tue Sep 02 12:13:24 2008 -0700
@@ -138,7 +138,7 @@
 {
   NS_LOG_FUNCTION (this << sifs);
   m_dcfManager->SetSifs (sifs);
-  m_sifs = sifs;
+  m_low->SetSifs (sifs);
 }
 void 
 NqstaWifiMac::SetEifsNoDifs (Time eifsNoDifs)
@@ -165,7 +165,7 @@
 Time 
 NqstaWifiMac::GetSifs (void) const
 {
-  return m_sifs;
+  return m_low->GetSifs ();
 }
 Time 
 NqstaWifiMac::GetEifsNoDifs (void) const

--- a/src/devices/wifi/nqsta-wifi-mac.h	Tue Sep 02 12:06:46 2008 -0700
+++ b/src/devices/wifi/nqsta-wifi-mac.h	Tue Sep 02 12:13:24 2008 -0700
@@ -154,7 +154,6 @@
   Mac48Address m_address;
   Ssid m_ssid;
   Time m_slot;
-  Time m_sifs;
   Time m_eifsNoDifs;
 };