From f5772f0423f35aafbefef542737ce98c6c879d1a Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Fri, 9 Nov 2007 09:35:13 +0100
Subject: [PATCH] set the retry bit and use it to filter duplicates

---
 src/devices/wifi/dca-txop.cc      | 7 +++----
 src/devices/wifi/mac-rx-middle.cc | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/devices/wifi/dca-txop.cc b/src/devices/wifi/dca-txop.cc
index 974e8bcc8..54655ed6b 100644
--- a/src/devices/wifi/dca-txop.cc
+++ b/src/devices/wifi/dca-txop.cc
@@ -402,8 +402,8 @@ DcaTxop::AccessGrantedNow (void)
       m_slrc = 0;
       m_fragmentNumber = 0;
       NS_LOG_DEBUG ("dequeued size="<<m_currentPacket.GetSize ()<<
-             ", to="<<m_currentHdr.GetAddr1 ()<<
-             ", seq="<<m_currentHdr.GetSequenceControl ()); 
+                    ", to="<<m_currentHdr.GetAddr1 ()<<
+                    ", seq="<<m_currentHdr.GetSequenceControl ()); 
     }
   MacLowTransmissionParameters params;
   params.DisableOverrideDurationId ();
@@ -535,8 +535,7 @@ DcaTxop::MissedAck (void)
     } 
   else 
     {
-      // XXX
-      //SetRetry (m_currentTxPacket); 
+      m_currentHdr.SetRetry ();
       if (!m_txFailedCallback.IsNull ()) 
         {
           m_txFailedCallback (m_currentHdr);
diff --git a/src/devices/wifi/mac-rx-middle.cc b/src/devices/wifi/mac-rx-middle.cc
index 1caf41cfc..95bb109e7 100644
--- a/src/devices/wifi/mac-rx-middle.cc
+++ b/src/devices/wifi/mac-rx-middle.cc
@@ -186,9 +186,10 @@ MacRxMiddle::Lookup (WifiMacHeader const *hdr)
 
 bool
 MacRxMiddle::IsDuplicate (WifiMacHeader const*hdr, 
-         OriginatorRxStatus *originator) const
+                          OriginatorRxStatus *originator) const
 {
-  if (originator->GetLastSequenceControl () == hdr->GetSequenceControl ()) 
+  if (hdr->IsRetry () &&
+      originator->GetLastSequenceControl () == hdr->GetSequenceControl ()) 
     {
       return true;
     }
@@ -265,7 +266,7 @@ MacRxMiddle::Receive (Packet packet, WifiMacHeader const *hdr)
   if (hdr->IsData ()) 
     {
       NS_ASSERT (SequenceControlSmaller (originator->GetLastSequenceControl (), 
-                                      hdr->GetSequenceControl ()));
+                                         hdr->GetSequenceControl ()));
       // filter duplicates.
       if (IsDuplicate (hdr, originator)) 
         {