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

wifi: GetEdThreshold should return a dBm value

Browse Source
This commit is contained in:
Sébastien Deronne
2018-04-06 23:32:13 +02:00
parent 8c84b8be73
commit b9064f504e
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

@@ -470,7 +470,7 @@ WifiPhy::SetEdThreshold (double threshold)
double
WifiPhy::GetEdThreshold (void) const
{
return m_edThresholdW;
return WToDbm (m_edThresholdW);
}
void
@@ -3608,7 +3608,7 @@ void
WifiPhy::StartRx (Ptr<Packet> packet, WifiTxVector txVector, MpduType mpdutype, double rxPowerW, Time rxDuration, Ptr<InterferenceHelper::Event> event)
{
NS_LOG_FUNCTION (this << packet << txVector << +mpdutype << rxPowerW << rxDuration);
if (rxPowerW > GetEdThreshold ()) //checked here, no need to check in the payload reception (current implementation assumes constant rx power over the packet duration)
if (rxPowerW > DbmToW (GetEdThreshold ())) //checked here, no need to check in the payload reception (current implementation assumes constant rx power over the packet duration)
{
AmpduTag ampduTag;
WifiPreamble preamble = txVector.GetPreambleType ();
@@ -3673,7 +3673,7 @@ WifiPhy::StartRx (Ptr<Packet> packet, WifiTxVector txVector, MpduType mpdutype,
else
{
NS_LOG_DEBUG ("drop packet because signal power too Small (" <<
rxPowerW << "<" << GetEdThreshold () << ")");
rxPowerW << "<" << DbmToW (GetEdThreshold ()) << ")");
NotifyRxDrop (packet);
m_plcpSuccess = false;
MaybeCcaBusyDuration ();