Mesh: Bug 1033 - airtime-metric: fixed

2011-06-02 19:45:03 +04:00
parent 5931a6e4f6
commit 9e1dd179fc
1 changed files with 5 additions and 0 deletions
--- a/src/mesh/model/dot11s/airtime-metric.cc
+++ b/src/mesh/model/dot11s/airtime-metric.cc
@@ -89,6 +89,11 @@ AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr<Mesh
  WifiMode mode = mac->GetWifiRemoteStationManager ()->GetDataMode (peerAddress, &m_testHeader, m_testFrame, m_testFrame->GetSize ());
  //obtain frame error rate:
  double failAvg = mac->GetWifiRemoteStationManager ()->GetInfo (peerAddress).GetFrameErrorRate ();
+  if (failAvg == 1)
+    {
+      // Retrun max metric value when frame error rate equals to 1
+      return (uint32_t)0xffffffff;
+    }
  NS_ASSERT (failAvg < 1.0);
  //calculate metric
  uint32_t metric = (uint32_t)((double)( /*Overhead + payload*/