F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: avoid unnecessary DbmToW conversions for CCA ED threshold

Browse Source
This commit is contained in:
Alexander Krotov
2018-12-27 12:22:49 +03:00
parent 94cf984119
commit cb13e3aee8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/model/wifi-phy.cc
View File

@@ -1716,7 +1716,7 @@ WifiPhy::ResumeFromOff (void)
case WifiPhyState::OFF:
{
NS_LOG_DEBUG ("resuming from off mode");
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaEdThresholdW);
m_state->SwitchFromOff (delayUntilCcaEnd);
break;
}
@@ -2636,7 +2636,7 @@ WifiPhy::MaybeCcaBusyDuration ()
//In this model, CCA becomes busy when the aggregation of all signals as
//tracked by the InterferenceHelper class is higher than the CcaBusyThreshold
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaEdThresholdW);
if (!delayUntilCcaEnd.IsZero ())
{
m_state->SwitchMaybeToCcaBusy (delayUntilCcaEnd);
@@ -3745,7 +3745,7 @@ WifiPhy::SwitchMaybeToCcaBusy (void)
//In this model, CCA becomes busy when the aggregation of all signals as
//tracked by the InterferenceHelper class is higher than the CcaBusyThreshold
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaEdThresholdW);
if (!delayUntilCcaEnd.IsZero ())
{
NS_LOG_DEBUG ("Calling SwitchMaybeToCcaBusy for " << delayUntilCcaEnd.As (Time::S));