From 9ac4410af2c4ac250a8da08c5474913a4d6072a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sun, 6 Nov 2022 17:35:40 +0100 Subject: [PATCH] wifi: WifiTxVector does no longer need to be passed together with WifiPpdu --- src/wifi/model/he/he-phy.cc | 38 +++++++++++----------------- src/wifi/model/he/he-phy.h | 9 ++----- src/wifi/model/ht/ht-phy.cc | 5 ++-- src/wifi/model/ht/ht-phy.h | 3 +-- src/wifi/model/non-ht/dsss-phy.cc | 5 ++-- src/wifi/model/non-ht/dsss-phy.h | 3 +-- src/wifi/model/non-ht/ofdm-phy.cc | 5 ++-- src/wifi/model/non-ht/ofdm-phy.h | 3 +-- src/wifi/model/phy-entity.cc | 12 ++++----- src/wifi/model/phy-entity.h | 9 ++----- src/wifi/model/spectrum-wifi-phy.cc | 4 +-- src/wifi/model/spectrum-wifi-phy.h | 2 +- src/wifi/model/wifi-phy.cc | 4 +-- src/wifi/model/wifi-phy.h | 3 +-- src/wifi/model/yans-wifi-phy.cc | 4 +-- src/wifi/model/yans-wifi-phy.h | 2 +- src/wifi/test/wifi-phy-ofdma-test.cc | 11 +++----- 17 files changed, 46 insertions(+), 76 deletions(-) diff --git a/src/wifi/model/he/he-phy.cc b/src/wifi/model/he/he-phy.cc index d9326459d..f41257cd4 100644 --- a/src/wifi/model/he/he-phy.cc +++ b/src/wifi/model/he/he-phy.cc @@ -346,7 +346,7 @@ HePhy::StartReceivePreamble(Ptr ppdu, Time rxDuration) { NS_LOG_FUNCTION(this << ppdu << rxDuration); - const WifiTxVector& txVector = ppdu->GetTxVector(); + const auto& txVector = ppdu->GetTxVector(); auto hePpdu = DynamicCast(ppdu); NS_ASSERT(hePpdu); HePpdu::TxPsdFlag psdFlag = hePpdu->GetTxPsdFlag(); @@ -447,7 +447,7 @@ HePhy::DoGetEvent(Ptr ppdu, RxPowerWattPerChannelBand& rxPowersW if (ppdu->GetType() == WIFI_PPDU_TYPE_UL_MU) { auto uidPreamblePair = std::make_pair(ppdu->GetUid(), ppdu->GetPreamble()); - const WifiTxVector& txVector = ppdu->GetTxVector(); + const auto& txVector = ppdu->GetTxVector(); Time rxDuration = CalculateNonOfdmaDurationForHeTb( txVector); // the OFDMA part of the transmission will be added later on const auto& currentPreambleEvents = GetCurrentPreambleEvents(); @@ -505,7 +505,7 @@ HePhy::DoGetEvent(Ptr ppdu, RxPowerWattPerChannelBand& rxPowersW } else if (ppdu->GetType() == WIFI_PPDU_TYPE_DL_MU) { - const WifiTxVector& txVector = ppdu->GetTxVector(); + const auto& txVector = ppdu->GetTxVector(); Time rxDuration = CalculateNonOfdmaDurationForHeMu( txVector); // the OFDMA part of the transmission will be added later on event = CreateInterferenceEvent(ppdu, ppdu->GetTxVector(), rxDuration, rxPowersW); @@ -747,7 +747,7 @@ Time HePhy::DoStartReceivePayload(Ptr event) { NS_LOG_FUNCTION(this << *event); - const WifiTxVector& txVector = event->GetTxVector(); + const auto& txVector = event->GetTxVector(); if (!txVector.IsMu()) { @@ -1247,22 +1247,20 @@ HePhy::ObtainNextUid(const WifiTxVector& txVector) } Ptr -HePhy::GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const +HePhy::GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu) const { auto hePpdu = DynamicCast(ppdu); NS_ASSERT(hePpdu); HePpdu::TxPsdFlag flag = hePpdu->GetTxPsdFlag(); - return GetTxPowerSpectralDensity(txPowerW, ppdu, txVector, flag); + return GetTxPowerSpectralDensity(txPowerW, ppdu, flag); } Ptr HePhy::GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu, - const WifiTxVector& txVector, HePpdu::TxPsdFlag flag) const { + const auto& txVector = ppdu->GetTxVector(); uint16_t centerFrequency = GetCenterFrequencyForChannelWidth(txVector); uint16_t channelWidth = txVector.GetChannelWidth(); NS_LOG_FUNCTION(this << centerFrequency << channelWidth << txPowerW << txVector); @@ -1378,7 +1376,7 @@ HePhy::GetCenterFrequencyForNonOfdmaPart(const WifiTxVector& txVector, uint16_t } void -HePhy::StartTx(Ptr ppdu, const WifiTxVector& txVector) +HePhy::StartTx(Ptr ppdu) { NS_LOG_FUNCTION(this << ppdu); if (ppdu->GetType() == WIFI_PPDU_TYPE_UL_MU || ppdu->GetType() == WIFI_PPDU_TYPE_DL_MU) @@ -1395,44 +1393,38 @@ HePhy::StartTx(Ptr ppdu, const WifiTxVector& txVector) hePpdu->SetTxPsdFlag(HePpdu::PSD_NON_HE_PORTION); // non-OFDMA part + const auto& txVector = ppdu->GetTxVector(); auto nonOfdmaDuration = ppdu->GetType() == WIFI_PPDU_TYPE_UL_MU ? CalculateNonOfdmaDurationForHeTb(txVector) : CalculateNonOfdmaDurationForHeMu(txVector); - auto nonOfdmaTxPowerSpectrum = GetTxPowerSpectralDensity(DbmToW(nonOfdmaTxPowerDbm), - ppdu, - txVector, - HePpdu::PSD_NON_HE_PORTION); + auto nonOfdmaTxPowerSpectrum = + GetTxPowerSpectralDensity(DbmToW(nonOfdmaTxPowerDbm), ppdu, HePpdu::PSD_NON_HE_PORTION); Transmit(nonOfdmaDuration, ppdu, - txVector, nonOfdmaTxPowerDbm, nonOfdmaTxPowerSpectrum, "non-OFDMA transmission"); // OFDMA part auto ofdmaDuration = ppdu->GetTxDuration() - nonOfdmaDuration; - auto ofdmaTxPowerSpectrum = GetTxPowerSpectralDensity(DbmToW(ofdmaTxPowerDbm), - ppdu, - txVector, - HePpdu::PSD_HE_PORTION); + auto ofdmaTxPowerSpectrum = + GetTxPowerSpectralDensity(DbmToW(ofdmaTxPowerDbm), ppdu, HePpdu::PSD_HE_PORTION); Simulator::Schedule(nonOfdmaDuration, &HePhy::StartTxOfdma, this, ppdu, - txVector, ofdmaTxPowerDbm, ofdmaTxPowerSpectrum, ofdmaDuration); } else { - PhyEntity::StartTx(ppdu, txVector); + PhyEntity::StartTx(ppdu); } } void HePhy::StartTxOfdma(Ptr ppdu, - const WifiTxVector& txVector, double txPowerDbm, Ptr txPowerSpectrum, Time ofdmaDuration) @@ -1441,7 +1433,7 @@ HePhy::StartTxOfdma(Ptr ppdu, auto hePpdu = DynamicCast(ppdu); NS_ASSERT(hePpdu); hePpdu->SetTxPsdFlag(HePpdu::PSD_HE_PORTION); - Transmit(ofdmaDuration, ppdu, txVector, txPowerDbm, txPowerSpectrum, "OFDMA transmission"); + Transmit(ofdmaDuration, ppdu, txPowerDbm, txPowerSpectrum, "OFDMA transmission"); } Time diff --git a/src/wifi/model/he/he-phy.h b/src/wifi/model/he/he-phy.h index 07ebcc978..97355bf04 100644 --- a/src/wifi/model/he/he-phy.h +++ b/src/wifi/model/he/he-phy.h @@ -104,7 +104,7 @@ class HePhy : public VhtPhy void CancelAllEvents() override; uint16_t GetStaId(const Ptr ppdu) const override; uint16_t GetMeasurementChannelWidth(const Ptr ppdu) const override; - void StartTx(Ptr ppdu, const WifiTxVector& txVector) override; + void StartTx(Ptr ppdu) override; Time CalculateTxDuration(WifiConstPsduMap psduMap, const WifiTxVector& txVector, WifiPhyBand band) const override; @@ -448,8 +448,7 @@ class HePhy : public VhtPhy void DoAbortCurrentReception(WifiPhyRxfailureReason reason) override; uint64_t ObtainNextUid(const WifiTxVector& txVector) override; Ptr GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const override; + Ptr ppdu) const override; uint32_t GetMaxPsduSize() const override; WifiConstPsduMap GetWifiConstPsduMap(Ptr psdu, const WifiTxVector& txVector) const override; @@ -534,26 +533,22 @@ class HePhy : public VhtPhy * * \param txPowerW power in W to spread across the bands * \param ppdu the PPDU that will be transmitted - * \param txVector the transmission parameters * \param flag flag indicating whether the PSD is for non-HE portion or HE portion * \return Pointer to SpectrumValue */ Ptr GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu, - const WifiTxVector& txVector, HePpdu::TxPsdFlag flag) const; /** * Start the transmission of the OFDMA part of the MU PPDU. * * \param ppdu the PPDU - * \param txVector the TXVECTOR used for the transmission of the PPDU * \param txPowerDbm the total TX power in dBm * \param txPowerSpectrum the TX PSD * \param ofdmaDuration the duration of the OFDMA part */ void StartTxOfdma(Ptr ppdu, - const WifiTxVector& txVector, double txPowerDbm, Ptr txPowerSpectrum, Time ofdmaDuration); diff --git a/src/wifi/model/ht/ht-phy.cc b/src/wifi/model/ht/ht-phy.cc index 50531b98f..f28bcfa73 100644 --- a/src/wifi/model/ht/ht-phy.cc +++ b/src/wifi/model/ht/ht-phy.cc @@ -459,10 +459,9 @@ HtPhy::IsConfigSupported(Ptr ppdu) const } Ptr -HtPhy::GetTxPowerSpectralDensity(double txPowerW, - Ptr /* ppdu */, - const WifiTxVector& txVector) const +HtPhy::GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu) const { + const auto& txVector = ppdu->GetTxVector(); uint16_t centerFrequency = GetCenterFrequencyForChannelWidth(txVector); uint16_t channelWidth = txVector.GetChannelWidth(); NS_LOG_FUNCTION(this << centerFrequency << channelWidth << txPowerW); diff --git a/src/wifi/model/ht/ht-phy.h b/src/wifi/model/ht/ht-phy.h index 5047536a9..948b6df9c 100644 --- a/src/wifi/model/ht/ht-phy.h +++ b/src/wifi/model/ht/ht-phy.h @@ -464,8 +464,7 @@ class HtPhy : public OfdmPhy bool IsAllConfigSupported(WifiPpduField field, Ptr ppdu) const override; bool IsConfigSupported(Ptr ppdu) const override; Ptr GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const override; + Ptr ppdu) const override; uint32_t GetMaxPsduSize() const override; CcaIndication GetCcaIndication(const Ptr ppdu) override; diff --git a/src/wifi/model/non-ht/dsss-phy.cc b/src/wifi/model/non-ht/dsss-phy.cc index a58363dd5..de71465e4 100644 --- a/src/wifi/model/non-ht/dsss-phy.cc +++ b/src/wifi/model/non-ht/dsss-phy.cc @@ -265,10 +265,9 @@ DsssPhy::GetMeasurementChannelWidth(const Ptr ppdu) const } Ptr -DsssPhy::GetTxPowerSpectralDensity(double txPowerW, - Ptr /* ppdu */, - const WifiTxVector& txVector) const +DsssPhy::GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu) const { + const auto& txVector = ppdu->GetTxVector(); uint16_t centerFrequency = GetCenterFrequencyForChannelWidth(txVector); uint16_t channelWidth = txVector.GetChannelWidth(); NS_LOG_FUNCTION(this << centerFrequency << channelWidth << txPowerW); diff --git a/src/wifi/model/non-ht/dsss-phy.h b/src/wifi/model/non-ht/dsss-phy.h index a2cceed12..39ee45724 100644 --- a/src/wifi/model/non-ht/dsss-phy.h +++ b/src/wifi/model/non-ht/dsss-phy.h @@ -161,8 +161,7 @@ class DsssPhy : public PhyEntity private: PhyFieldRxStatus DoEndReceiveField(WifiPpduField field, Ptr event) override; Ptr GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const override; + Ptr ppdu) const override; uint16_t GetRxChannelWidth(const WifiTxVector& txVector) const override; uint16_t GetMeasurementChannelWidth(const Ptr ppdu) const override; diff --git a/src/wifi/model/non-ht/ofdm-phy.cc b/src/wifi/model/non-ht/ofdm-phy.cc index a041ab757..501183a05 100644 --- a/src/wifi/model/non-ht/ofdm-phy.cc +++ b/src/wifi/model/non-ht/ofdm-phy.cc @@ -361,10 +361,9 @@ OfdmPhy::IsAllConfigSupported(WifiPpduField /* field */, Ptr ppd } Ptr -OfdmPhy::GetTxPowerSpectralDensity(double txPowerW, - Ptr /* ppdu */, - const WifiTxVector& txVector) const +OfdmPhy::GetTxPowerSpectralDensity(double txPowerW, Ptr ppdu) const { + const auto& txVector = ppdu->GetTxVector(); uint16_t centerFrequency = GetCenterFrequencyForChannelWidth(txVector); uint16_t channelWidth = txVector.GetChannelWidth(); NS_LOG_FUNCTION(this << centerFrequency << channelWidth << txPowerW); diff --git a/src/wifi/model/non-ht/ofdm-phy.h b/src/wifi/model/non-ht/ofdm-phy.h index bbd5274d2..5fdc32c09 100644 --- a/src/wifi/model/non-ht/ofdm-phy.h +++ b/src/wifi/model/non-ht/ofdm-phy.h @@ -324,8 +324,7 @@ class OfdmPhy : public PhyEntity protected: PhyFieldRxStatus DoEndReceiveField(WifiPpduField field, Ptr event) override; Ptr GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const override; + Ptr ppdu) const override; uint32_t GetMaxPsduSize() const override; uint16_t GetMeasurementChannelWidth(const Ptr ppdu) const override; diff --git a/src/wifi/model/phy-entity.cc b/src/wifi/model/phy-entity.cc index 6aae2c6ee..0acfc4c47 100644 --- a/src/wifi/model/phy-entity.cc +++ b/src/wifi/model/phy-entity.cc @@ -1279,23 +1279,23 @@ PhyEntity::NotifyPayloadBegin(const WifiTxVector& txVector, const Time& payloadD } void -PhyEntity::StartTx(Ptr ppdu, const WifiTxVector& txVector) +PhyEntity::StartTx(Ptr ppdu) { - NS_LOG_FUNCTION(this << ppdu << txVector); + NS_LOG_FUNCTION(this << ppdu); auto txPowerDbm = m_wifiPhy->GetTxPowerForTransmission(ppdu) + m_wifiPhy->GetTxGain(); - auto txPowerSpectrum = GetTxPowerSpectralDensity(DbmToW(txPowerDbm), ppdu, txVector); - Transmit(ppdu->GetTxDuration(), ppdu, txVector, txPowerDbm, txPowerSpectrum, "transmission"); + auto txVector = ppdu->GetTxVector(); + auto txPowerSpectrum = GetTxPowerSpectralDensity(DbmToW(txPowerDbm), ppdu); + Transmit(ppdu->GetTxDuration(), ppdu, txPowerDbm, txPowerSpectrum, "transmission"); } void PhyEntity::Transmit(Time txDuration, Ptr ppdu, - const WifiTxVector& txVector, double txPowerDbm, Ptr txPowerSpectrum, const std::string& type) { - NS_LOG_FUNCTION(this << txDuration << ppdu << txVector << txPowerDbm << type); + NS_LOG_FUNCTION(this << txDuration << ppdu << txPowerDbm << type); NS_LOG_DEBUG("Start " << type << ": signal power before antenna gain=" << txPowerDbm << "dBm"); auto txParams = Create(); txParams->duration = txDuration; diff --git a/src/wifi/model/phy-entity.h b/src/wifi/model/phy-entity.h index 9031329de..53ac84fa5 100644 --- a/src/wifi/model/phy-entity.h +++ b/src/wifi/model/phy-entity.h @@ -476,9 +476,8 @@ class PhyEntity : public SimpleRefCount * \see SpectrumWifiPhy::StartTx * * \param ppdu the PPDU to send - * \param txVector the TXVECTOR used for the transmission of the PPDU */ - virtual void StartTx(Ptr ppdu, const WifiTxVector& txVector); + virtual void StartTx(Ptr ppdu); /** * This function prepares most of the WifiSpectrumSignalParameters @@ -487,14 +486,12 @@ class PhyEntity : public SimpleRefCount * * \param txDuration the duration of the transmission * \param ppdu the PPDU to send - * \param txVector the TXVECTOR used for the transmission of the PPDU * \param txPowerDbm the total TX power in dBm * \param txPowerSpectrum the TX PSD * \param type the type of transmission (for logging) */ void Transmit(Time txDuration, Ptr ppdu, - const WifiTxVector& txVector, double txPowerDbm, Ptr txPowerSpectrum, const std::string& type); @@ -833,15 +830,13 @@ class PhyEntity : public SimpleRefCount /** * \param txPowerW power in W to spread across the bands * \param ppdu the PPDU that will be transmitted - * \param txVector the transmission parameters * \return Pointer to SpectrumValue * * This is a helper function to create the right TX PSD corresponding * to the amendment of this PHY. */ virtual Ptr GetTxPowerSpectralDensity(double txPowerW, - Ptr ppdu, - const WifiTxVector& txVector) const = 0; + Ptr ppdu) const = 0; /** * Get the center frequency of the channel corresponding the current TxVector rather than diff --git a/src/wifi/model/spectrum-wifi-phy.cc b/src/wifi/model/spectrum-wifi-phy.cc index 46cb090b0..efda74cf1 100644 --- a/src/wifi/model/spectrum-wifi-phy.cc +++ b/src/wifi/model/spectrum-wifi-phy.cc @@ -444,10 +444,10 @@ SpectrumWifiPhy::CreateWifiSpectrumPhyInterface(Ptr device) } void -SpectrumWifiPhy::StartTx(Ptr ppdu, const WifiTxVector& txVector) +SpectrumWifiPhy::StartTx(Ptr ppdu) { NS_LOG_FUNCTION(this << ppdu); - GetPhyEntity(ppdu->GetModulation())->StartTx(ppdu, txVector); + GetPhyEntity(ppdu->GetModulation())->StartTx(ppdu); } void diff --git a/src/wifi/model/spectrum-wifi-phy.h b/src/wifi/model/spectrum-wifi-phy.h index 174ec482c..ac3616cc6 100644 --- a/src/wifi/model/spectrum-wifi-phy.h +++ b/src/wifi/model/spectrum-wifi-phy.h @@ -69,7 +69,7 @@ class SpectrumWifiPhy : public WifiPhy ~SpectrumWifiPhy() override; // Implementation of pure virtual method. - void StartTx(Ptr ppdu, const WifiTxVector& txVector) override; + void StartTx(Ptr ppdu) override; Ptr GetChannel() const override; uint16_t GetGuardBandwidth(uint16_t currentChannelWidth) const override; std::tuple GetTxMaskRejectionParams() const override; diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index dd185160c..1cefc6332 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -1727,7 +1727,7 @@ WifiPhy::Send(WifiConstPsduMap psdus, const WifiTxVector& txVector) m_endTxEvent = Simulator::Schedule(txDuration, &WifiPhy::NotifyTxEnd, this, psdus); // TODO: fix for MU - StartTx(ppdu, txVector); + StartTx(ppdu); ppdu->ResetTxVector(); m_channelAccessRequested = false; @@ -2073,7 +2073,7 @@ double WifiPhy::GetTxPowerForTransmission(Ptr ppdu) const { NS_LOG_FUNCTION(this << m_powerRestricted << ppdu); - const WifiTxVector& txVector = ppdu->GetTxVector(); + const auto& txVector = ppdu->GetTxVector(); // Get transmit power before antenna gain double txPowerDbm; if (!m_powerRestricted) diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index 7881994b4..0d6ff0521 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -151,9 +151,8 @@ class WifiPhy : public Object /** * \param ppdu the PPDU to send - * \param txVector the TXVECTOR to use to send the PPDU */ - virtual void StartTx(Ptr ppdu, const WifiTxVector& txVector) = 0; + virtual void StartTx(Ptr ppdu) = 0; /** * Put in sleep mode. diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index 410d78ffc..9d4d789fd 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -87,11 +87,11 @@ YansWifiPhy::SetChannel(const Ptr channel) } void -YansWifiPhy::StartTx(Ptr ppdu, const WifiTxVector& txVector) +YansWifiPhy::StartTx(Ptr ppdu) { NS_LOG_FUNCTION(this << ppdu); NS_LOG_DEBUG("Start transmission: signal power before antenna gain=" - << GetPowerDbm(txVector.GetTxPowerLevel()) << "dBm"); + << GetPowerDbm(ppdu->GetTxVector().GetTxPowerLevel()) << "dBm"); m_channel->Send(this, ppdu, GetTxPowerForTransmission(ppdu) + GetTxGain()); } diff --git a/src/wifi/model/yans-wifi-phy.h b/src/wifi/model/yans-wifi-phy.h index 5183ca48f..0cbdc7802 100644 --- a/src/wifi/model/yans-wifi-phy.h +++ b/src/wifi/model/yans-wifi-phy.h @@ -57,7 +57,7 @@ class YansWifiPhy : public WifiPhy ~YansWifiPhy() override; void SetInterferenceHelper(const Ptr helper) override; - void StartTx(Ptr ppdu, const WifiTxVector& txVector) override; + void StartTx(Ptr ppdu) override; Ptr GetChannel() const override; uint16_t GetGuardBandwidth(uint16_t currentChannelWidth) const override; std::tuple GetTxMaskRejectionParams() const override; diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index a409d8893..8bbb973a6 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -149,6 +149,7 @@ class OfdmaSpectrumWifiPhy : public SpectrumWifiPhy void DoDispose() override; using WifiPhy::Reset; + void StartTx(Ptr ppdu) override; /** * TracedCallback signature for UID of transmitted PPDU. @@ -157,12 +158,6 @@ class OfdmaSpectrumWifiPhy : public SpectrumWifiPhy */ typedef void (*TxPpduUidCallback)(uint64_t uid); - /** - * \param ppdu the PPDU to send - * \param txVector the TXVECTOR used for the transmission of the PPDU - */ - void StartTx(Ptr ppdu, const WifiTxVector& txVector) override; - /** * Set the global PPDU UID counter. * @@ -263,10 +258,10 @@ OfdmaSpectrumWifiPhy::SetTriggerFrameUid(uint64_t uid) } void -OfdmaSpectrumWifiPhy::StartTx(Ptr ppdu, const WifiTxVector& txVector) +OfdmaSpectrumWifiPhy::StartTx(Ptr ppdu) { m_phyTxPpduUidTrace(ppdu->GetUid()); - SpectrumWifiPhy::StartTx(ppdu, txVector); + SpectrumWifiPhy::StartTx(ppdu); } std::map, Ptr>&