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

wifi: Use length field from TXVECTOR to compute the TX duration of a HE TB PPDU

Browse Source
This commit is contained in:
Sébastien Deronne
2019-08-22 21:06:19 +02:00
parent bc9a69f199
commit d403ff4c7e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2630,6 +2630,11 @@ WifiPhy::CalculateTxDuration (uint32_t size, WifiTxVector txVector, WifiPhyBand
Time
WifiPhy::CalculateTxDuration (WifiConstPsduMap psduMap, WifiTxVector txVector, WifiPhyBand band)
{
if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_TB)
{
return ConvertLSigLengthToHeTbPpduDuration (txVector.GetLength (), txVector, band);
}
Time maxDuration = Seconds (0);
for (auto & staIdPsdu : psduMap)
{
@@ -2815,8 +2820,17 @@ WifiPhy::Send (WifiConstPsduMap psdus, WifiTxVector txVector)
}
return;
}
Time txDuration = CalculateTxDuration (psdus, txVector, GetPhyBand ());
Time txDuration;
if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_TB)
{
NS_ASSERT (txVector.GetLength () > 0);
txDuration = ConvertLSigLengthToHeTbPpduDuration (txVector.GetLength (), txVector, GetPhyBand ());
}
else
{
txDuration = CalculateTxDuration (psdus, txVector, GetPhyBand ());
}
if ((m_currentEvent != 0) && (m_currentEvent->GetEndTime () > (Simulator::Now () + m_state->GetDelayUntilIdle ())))
{