merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Mon, 19 Nov 2007 16:54:04 +0100
changeset 2147 b6243a53c93f
parent 2146 40ad60ac9912 (current diff)
parent 2137 3eeabad35e98 (diff)
child 2148 4c9b6134023a
merge with HEAD
src/devices/wifi/mac-low.cc
--- a/src/devices/wifi/mac-low.cc	Mon Nov 19 16:53:05 2007 +0100
+++ b/src/devices/wifi/mac-low.cc	Mon Nov 19 16:54:04 2007 +0100
@@ -769,6 +769,9 @@
 MacLow::CtsTimeout (void)
 {
   MY_DEBUG ("cts timeout");
+  // XXX: should check that there was no rx start before now.
+  // we should restart a new cts timeout now until the expected
+  // end of rx if there was a rx start before now.
   MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
   station->ReportRtsFailed ();
   m_hasCurrent = false;
@@ -780,6 +783,9 @@
 MacLow::NormalAckTimeout (void)
 {
   MY_DEBUG ("normal ack timeout");
+  // XXX: should check that there was no rx start before now.
+  // we should restart a new ack timeout now until the expected
+  // end of rx if there was a rx start before now.
   MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
   station->ReportDataFailed ();
   MacLowTransmissionListener *listener = m_listener;