--- a/src/devices/wifi/wifi-mac-header.cc	Wed Oct 24 15:05:17 2007 +0200
+++ b/src/devices/wifi/wifi-mac-header.cc	Wed Oct 24 16:02:10 2007 +0200
@@ -254,14 +254,15 @@
   m_ctrlFromDs = 0;
 }
 void 
-WifiMacHeader::SetDuration (uint16_t duration)
+WifiMacHeader::SetRawDuration (uint16_t duration)
 {
   m_duration = duration;
 }
 void 
-WifiMacHeader::SetDurationUs (uint64_t duration_us)
+WifiMacHeader::SetDuration (Time duration)
 {
-  NS_ASSERT (duration_us <= (1<<16) - 1);
+  int64_t duration_us = duration.GetMicroSeconds ();
+  NS_ASSERT (duration_us >= 0 && duration_us <= 0x7fff);
   m_duration = static_cast<uint16_t> (duration_us);
 }
 
@@ -554,14 +555,14 @@
 
 
 uint16_t 
-WifiMacHeader::GetDuration (void) const
+WifiMacHeader::GetRawDuration (void) const
 {
   return m_duration;
 }
-uint64_t 
-WifiMacHeader::GetDurationUs (void) const
+Time
+WifiMacHeader::GetDuration (void) const
 {
-  return m_duration;
+  return MicroSeconds (m_duration);
 }
 uint16_t 
 WifiMacHeader::GetSequenceControl (void) const
@@ -674,15 +675,6 @@
   m_qosStuff = (qos >> 8) & 0x00ff;
 }
 
-
-void 
-WifiMacHeader::SetDurationS (double duration)
-{
-  uint16_t us = (uint16_t)(duration * 1000000);
-  us &= 0x7fff;
-  SetDuration (us);
-}
-
 uint32_t 
 WifiMacHeader::GetSize (void) const
 {