Bug 1616 - WifiPhyStateHelper reports false CCA_BUSY times at State trace source

2013-10-09 16:39:36 -04:00
parent cceac0b037
commit 1f74b54e1d
2 changed files with 5 additions and 1 deletions
--- a/1
+++ b/1
@@ -27,6 +27,7 @@ New user-visible features
 Bugs fixed
 ----------
 - Bug 1722 - beacons transmitted concurrently
+- Bug 1616 - WifiPhyStateHelper reports false CCA_BUSY times at State trace source

 Release 3.18
 =============
--- a/src/wifi/model/wifi-phy-state-helper.cc
+++ b/src/wifi/model/wifi-phy-state-helper.cc
@@ -420,7 +420,10 @@ WifiPhyStateHelper::SwitchMaybeToCcaBusy (Time duration)
    case WifiPhy::TX:
      break;
    }
-  m_startCcaBusy = now;
+  if (GetState () != WifiPhy::CCA_BUSY)
+    {
+      m_startCcaBusy = now;
+    }
  m_endCcaBusy = std::max (m_endCcaBusy, now + duration);
 }