From b809739d8c9752d033d19b09d3f6e39e28fcc7f6 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 19 Nov 2007 14:22:45 +0100
Subject: [PATCH] avoid decrementing by too many backoff slots

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

diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/dcf-manager.cc
index 6bc67e96d..760fed8ed 100644
--- a/src/devices/wifi/dcf-manager.cc
+++ b/src/devices/wifi/dcf-manager.cc
@@ -57,8 +57,7 @@ DcfState::UpdateFailedCw (void)
 void 
 DcfState::UpdateBackoffSlotsNow (uint32_t nSlots, Time backoffUpdateBound)
 {
-  uint32_t n = std::min (nSlots, m_backoffSlots);
-  m_backoffSlots -= n;
+  m_backoffSlots -= nSlots;
   m_backoffStart = backoffUpdateBound;
   MY_DEBUG ("update slots="<<nSlots<<" slots, backoff="<<m_backoffSlots);
 }
@@ -229,7 +228,8 @@ DcfManager::DoGrantAccess (void)
               if (otherState->NeedsAccess () &&
                   GetBackoffEndFor (otherState) <= Simulator::Now ())
                 {
-                  MY_DEBUG ("dcf " << k << " needs access. backoff expired. internal collision.");
+                  MY_DEBUG ("dcf " << k << " needs access. backoff expired. internal collision. slots=" << 
+                            otherState->GetBackoffSlots ());
                   /**
                    * all other dcfs with a lower priority whose backoff
                    * has expired and which needed access to the medium
@@ -334,9 +334,10 @@ DcfManager::UpdateBackoff (void)
            */
           if (nIntSlots >= state->GetAifsn ())
             {
-              MY_DEBUG ("dcf " << k << " dec backoff slots=" << nIntSlots);
-              Time backoffUpdateBound = backoffStart + Scalar (nIntSlots) * m_slotTime;
-              state->UpdateBackoffSlotsNow (nIntSlots, backoffUpdateBound);
+              uint32_t n = std::min (nIntSlots, state->GetBackoffSlots ());
+              MY_DEBUG ("dcf " << k << " dec backoff slots=" << n);
+              Time backoffUpdateBound = backoffStart + Scalar (n) * m_slotTime;
+              state->UpdateBackoffSlotsNow (n, backoffUpdateBound);
             }
         }
     }