From 7cd57c9a8a52378ffe578d99dcec10d568ce5599 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 4 May 2022 12:48:41 +0200 Subject: [PATCH] wifi: Remove unused PHY methods --- src/wifi/model/wifi-phy.cc | 24 ------------------------ src/wifi/model/wifi-phy.h | 9 --------- 2 files changed, 33 deletions(-) diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 4492bfb8c..4f486ab40 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -351,7 +351,6 @@ WifiPhy::DoDispose (void) m_preambleDetectionModel = 0; m_wifiRadioEnergyModel = 0; m_postReceptionErrorModel = 0; - m_supportedChannelWidthSet.clear (); if (m_interference != nullptr) { m_interference->Dispose (); @@ -1066,8 +1065,6 @@ WifiPhy::DoChannelSwitch (void) ConfigureStandard (m_standard); } - AddSupportedChannelWidth (GetChannelWidth ()); - if (IsInitialized ()) { // notify channel switching @@ -1165,27 +1162,6 @@ WifiPhy::GetBssMembershipSelectorList (void) const return list; } -void -WifiPhy::AddSupportedChannelWidth (uint16_t width) -{ - NS_LOG_FUNCTION (this << width); - for (std::vector::size_type i = 0; i != m_supportedChannelWidthSet.size (); i++) - { - if (m_supportedChannelWidthSet[i] == width) - { - return; - } - } - NS_LOG_FUNCTION ("Adding " << width << " to supported channel width set"); - m_supportedChannelWidthSet.push_back (width); -} - -std::vector -WifiPhy::GetSupportedChannelWidthSet (void) const -{ - return m_supportedChannelWidthSet; -} - void WifiPhy::SetSleepMode (void) { diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index c8f23400d..3b3324829 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -935,14 +935,6 @@ public: * \return the channel width in MHz */ uint16_t GetChannelWidth (void) const; - /** - * \param width the channel width (in MHz) to support - */ - void AddSupportedChannelWidth (uint16_t width); - /** - * \return a vector containing the supported channel widths, values in MHz - */ - std::vector GetSupportedChannelWidthSet (void) const; /** * Get the power of the given power level in dBm. @@ -1358,7 +1350,6 @@ private: WifiPhyBand m_band; //!< WifiPhyBand ChannelTuple m_channelSettings; //!< Store operating channel settings until initialization WifiPhyOperatingChannel m_operatingChannel; //!< Operating channel - std::vector m_supportedChannelWidthSet; //!< Supported channel width set (MHz) Time m_sifs; //!< Short Interframe Space (SIFS) duration Time m_slot; //!< Slot duration