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

wifi: We do not need to abort in functions returning a well-defined duration

Browse Source
This commit is contained in:
Sébastien Deronne
2022-10-04 20:49:43 +02:00
committed by Tom Henderson
parent 55f460571a
commit 30db47be6f
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wifi/model/eht/eht-phy.cc
View File

@@ -132,7 +132,6 @@ EhtPhy::GetDuration(WifiPpduField field, const WifiTxVector& txVector) const
Time
EhtPhy::CalculateNonOfdmaDurationForHeTb(const WifiTxVector& txVector) const
{
NS_ABORT_IF(!txVector.IsUlMu() || (txVector.GetModulationClass() < WIFI_MOD_CLASS_EHT));
Time duration = GetDuration(WIFI_PPDU_FIELD_PREAMBLE, txVector) +
GetDuration(WIFI_PPDU_FIELD_NON_HT_HEADER, txVector) +
GetDuration(WIFI_PPDU_FIELD_U_SIG, txVector);
@@ -142,7 +141,6 @@ EhtPhy::CalculateNonOfdmaDurationForHeTb(const WifiTxVector& txVector) const
Time
EhtPhy::CalculateNonOfdmaDurationForHeMu(const WifiTxVector& txVector) const
{
NS_ABORT_IF(!txVector.IsDlMu() || (txVector.GetModulationClass() < WIFI_MOD_CLASS_EHT));
Time duration = GetDuration(WIFI_PPDU_FIELD_PREAMBLE, txVector) +
GetDuration(WIFI_PPDU_FIELD_NON_HT_HEADER, txVector) +
GetDuration(WIFI_PPDU_FIELD_U_SIG, txVector) +

2
src/wifi/model/he/he-phy.cc
View File

@@ -287,7 +287,6 @@ HePhy::ConvertLSigLengthToHeTbPpduDuration(uint16_t length,
Time
HePhy::CalculateNonOfdmaDurationForHeTb(const WifiTxVector& txVector) const
{
NS_ABORT_IF(!txVector.IsUlMu() || (txVector.GetModulationClass() < WIFI_MOD_CLASS_HE));
Time duration = GetDuration(WIFI_PPDU_FIELD_PREAMBLE, txVector) +
GetDuration(WIFI_PPDU_FIELD_NON_HT_HEADER, txVector) +
GetDuration(WIFI_PPDU_FIELD_SIG_A, txVector);
@@ -297,7 +296,6 @@ HePhy::CalculateNonOfdmaDurationForHeTb(const WifiTxVector& txVector) const
Time
HePhy::CalculateNonOfdmaDurationForHeMu(const WifiTxVector& txVector) const
{
NS_ABORT_IF(!txVector.IsDlMu() || (txVector.GetModulationClass() < WIFI_MOD_CLASS_HE));
Time duration = GetDuration(WIFI_PPDU_FIELD_PREAMBLE, txVector) +
GetDuration(WIFI_PPDU_FIELD_NON_HT_HEADER, txVector) +
GetDuration(WIFI_PPDU_FIELD_SIG_A, txVector) +