From aeb8f6f1b652ffe3ff9347547b6bd487759fa13e Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 5 Jun 2021 17:07:12 -0700 Subject: [PATCH] wifi: Improve error model processing of header fields --- src/wifi/model/interference-helper.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index f2dd6ba8c..409711816 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -500,18 +500,9 @@ InterferenceHelper::CalculatePhyHeaderSectionPsr (Ptr event, NiChan Time duration = Min (stop, current) - Max (start, previous); if (duration.IsStrictlyPositive ()) { - WifiMode mode = section.second.second; - if (mode.GetModulationClass () < WIFI_MOD_CLASS_OFDM) - { - psr *= CalculateChunkSuccessRate (snr, duration, mode, event->GetTxVector (), WIFI_PPDU_FIELD_NON_HT_HEADER); - } - else - { - //FIXME: this will be directly available with PHY refactoring, hence assume HT-SIG for now since error rate model do not differentiate these non-HT PHY headers yet - psr *= CalculateChunkSuccessRate (snr, duration, mode, event->GetTxVector (), WIFI_PPDU_FIELD_HT_SIG); - } + psr *= CalculateChunkSuccessRate (snr, duration, section.second.second, event->GetTxVector (), section.first); NS_LOG_DEBUG ("Current NI change in " << section.first << " [" << start << ", " << stop << "] for " - << duration.As (Time::NS) << ": mode=" << mode << ", psr=" << psr); + << duration.As (Time::NS) << ": mode=" << section.second.second << ", psr=" << psr); } } }