From d20ccf186e3246d560cf0cf91ad40af44537b796 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Wed, 14 Nov 2007 14:11:11 +0100
Subject: [PATCH] handle NAV correctly

---
 src/devices/wifi/dcf-manager.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/dcf-manager.cc
index 1b8e7baf3..9ffbb75db 100644
--- a/src/devices/wifi/dcf-manager.cc
+++ b/src/devices/wifi/dcf-manager.cc
@@ -435,9 +435,13 @@ DcfManager::NotifyNavStartNow (Time duration)
   NS_ASSERT (m_lastNavStart < Simulator::Now ());
   MY_DEBUG ("nav start for="<<duration);
   UpdateBackoff ();
-  // XXX handle 
-  m_lastNavStart = Simulator::Now ();
-  m_lastNavDuration = duration;
+  Time newNavEnd = Simulator::Now () + duration;
+  Time lastNavEnd = m_lastNavStart + m_lastNavDuration;
+  if (newNavEnd > lastNavEnd)
+    {
+      m_lastNavStart = Simulator::Now ();
+      m_lastNavDuration = duration;
+    }
 }
 
 } // namespace ns3