From 30db47be6fd52d2761d5a96a2d50551b7197244f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 4 Oct 2022 20:49:43 +0200 Subject: [PATCH] wifi: We do not need to abort in functions returning a well-defined duration --- src/wifi/model/eht/eht-phy.cc | 2 -- src/wifi/model/he/he-phy.cc | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/wifi/model/eht/eht-phy.cc b/src/wifi/model/eht/eht-phy.cc index 574d500ed..324472b2d 100644 --- a/src/wifi/model/eht/eht-phy.cc +++ b/src/wifi/model/eht/eht-phy.cc @@ -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) + diff --git a/src/wifi/model/he/he-phy.cc b/src/wifi/model/he/he-phy.cc index 1f8471a40..7d8cd0261 100644 --- a/src/wifi/model/he/he-phy.cc +++ b/src/wifi/model/he/he-phy.cc @@ -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) +