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

wifi: Remove unused payloadMode argument

Browse Source
This commit is contained in:
Sébastien Deronne
2017-02-25 15:46:34 +01:00
parent 0a03c67edb
commit ffae28e44f
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wifi/model/interference-helper.cc
View File

@@ -344,23 +344,22 @@ InterferenceHelper::CalculatePlcpHeaderPer (Ptr<const InterferenceHelper::Event>
double psr = 1.0; /* Packet Success Rate */
NiChanges::iterator j = ni->begin ();
Time previous = (*j).GetTime ();
WifiMode payloadMode = event->GetPayloadMode ();
WifiPreamble preamble = event->GetTxVector ().GetPreambleType ();
WifiMode mcsHeaderMode;
if (preamble == WIFI_PREAMBLE_HT_MF || preamble == WIFI_PREAMBLE_HT_GF)
{
//mode for PLCP header fields sent with HT modulation
mcsHeaderMode = WifiPhy::GetHtPlcpHeaderMode (payloadMode);
mcsHeaderMode = WifiPhy::GetHtPlcpHeaderMode ();
}
else if (preamble == WIFI_PREAMBLE_VHT)
{
//mode for PLCP header fields sent with VHT modulation
mcsHeaderMode = WifiPhy::GetVhtPlcpHeaderMode (payloadMode);
mcsHeaderMode = WifiPhy::GetVhtPlcpHeaderMode ();
}
else if (preamble == WIFI_PREAMBLE_HE_SU)
{
//mode for PLCP header fields sent with HE modulation
mcsHeaderMode = WifiPhy::GetHePlcpHeaderMode (payloadMode);
mcsHeaderMode = WifiPhy::GetHePlcpHeaderMode ();
}
WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (event->GetTxVector ());
Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (event->GetTxVector ()); //packet start time + preamble

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

@@ -1645,19 +1645,19 @@ WifiPhy::ResumeFromSleep (void)
}
WifiMode
WifiPhy::GetHtPlcpHeaderMode (WifiMode payloadMode)
WifiPhy::GetHtPlcpHeaderMode ()
{
return WifiPhy::GetHtMcs0 ();
}
WifiMode
WifiPhy::GetVhtPlcpHeaderMode (WifiMode payloadMode)
WifiPhy::GetVhtPlcpHeaderMode ()
{
return WifiPhy::GetVhtMcs0 ();
}
WifiMode
WifiPhy::GetHePlcpHeaderMode (WifiMode payloadMode)
WifiPhy::GetHePlcpHeaderMode ()
{
return WifiPhy::GetHeMcs0 ();
}

12
src/wifi/model/wifi-phy.h
View File

@@ -380,24 +380,18 @@ public:
*/
static Time GetPlcpTrainingSymbolDuration (WifiTxVector txVector);
/**
* \param payloadMode the WifiMode use for the transmission of the payload
*
* \return the WifiMode used for the transmission of the HT-SIG and the HT training fields
* in Mixed Format and greenfield format PLCP header
*/
static WifiMode GetHtPlcpHeaderMode (WifiMode payloadMode);
static WifiMode GetHtPlcpHeaderMode ();
/**
* \param payloadMode the WifiMode use for the transmission of the payload
*
* \return the WifiMode used for the transmission of the VHT-STF, VHT-LTF and VHT-SIG-B fields
*/
static WifiMode GetVhtPlcpHeaderMode (WifiMode payloadMode);
static WifiMode GetVhtPlcpHeaderMode ();
/**
* \param payloadMode the WifiMode use for the transmission of the payload
*
* \return the WifiMode used for the transmission of the HE-STF, HE-LTF and HE-SIG-B fields
*/
static WifiMode GetHePlcpHeaderMode (WifiMode payloadMode);
static WifiMode GetHePlcpHeaderMode ();
/**
* \param preamble the type of preamble
*