wifi: Obsolete the HeConfiguration::MpduBufferSize attribute and cleanup unneeded methods

This commit is contained in:
Stefano Avallone
2023-08-14 16:36:36 +02:00
parent 92580cb106
commit 2f624efd38
6 changed files with 5 additions and 50 deletions

View File

@@ -67,11 +67,12 @@ HeConfiguration::GetTypeId()
&HeConfiguration::SetMaxTbPpduDelay),
MakeTimeChecker(Seconds(0)))
.AddAttribute("MpduBufferSize",
"The MPDU buffer size for receiving A-MPDUs",
"This attribute is obsolete. Use the WifiMac::MpduBufferSize attribute "
"instead.",
UintegerValue(64),
MakeUintegerAccessor(&HeConfiguration::GetMpduBufferSize,
&HeConfiguration::SetMpduBufferSize),
MakeUintegerChecker<uint16_t>(64, 256))
MakeUintegerAccessor(&HeConfiguration::m_mpduBufferSize),
MakeUintegerChecker<uint16_t>(64, 256),
TypeId::OBSOLETE)
.AddAttribute("MuBeAifsn",
"AIFSN used by BE EDCA when the MU EDCA Timer is running. "
"It must be either zero (EDCA disabled) or a value from 2 to 15.",
@@ -223,17 +224,4 @@ HeConfiguration::SetMaxTbPpduDelay(Time maxTbPpduDelay)
m_maxTbPpduDelay = maxTbPpduDelay;
}
void
HeConfiguration::SetMpduBufferSize(uint16_t size)
{
NS_LOG_FUNCTION(this << size);
m_mpduBufferSize = size;
}
uint16_t
HeConfiguration::GetMpduBufferSize() const
{
return m_mpduBufferSize;
}
} // namespace ns3

View File

@@ -68,14 +68,6 @@ class HeConfiguration : public Object
* \return the maximum TB PPDU delay
*/
Time GetMaxTbPpduDelay() const;
/**
* \param size the MPDU buffer size to receive A-MPDUs
*/
void SetMpduBufferSize(uint16_t size);
/**
* \return the MPDU buffer size to receive A-MPDUs
*/
uint16_t GetMpduBufferSize() const;
private:
Time m_guardInterval; //!< Supported HE guard interval

View File

@@ -96,17 +96,6 @@ HeFrameExchangeManager::Reset()
VhtFrameExchangeManager::Reset();
}
uint16_t
HeFrameExchangeManager::GetSupportedBaBufferSize() const
{
NS_ASSERT(m_mac->GetHeConfiguration());
if (m_mac->GetHeConfiguration()->GetMpduBufferSize() > 64)
{
return 256;
}
return 64;
}
void
HeFrameExchangeManager::SetWifiMac(const Ptr<WifiMac> mac)
{

View File

@@ -75,7 +75,6 @@ class HeFrameExchangeManager : public VhtFrameExchangeManager
HeFrameExchangeManager();
~HeFrameExchangeManager() override;
uint16_t GetSupportedBaBufferSize() const override;
bool StartFrameExchange(Ptr<QosTxop> edca, Time availableTime, bool initialFrame) override;
void SetWifiMac(const Ptr<WifiMac> mac) override;
void CalculateAcknowledgmentTime(WifiAcknowledgment* acknowledgment) const override;

View File

@@ -309,12 +309,6 @@ HtFrameExchangeManager::SendAddBaResponse(const MgtAddBaRequestHeader* reqHdr,
m_mac->GetQosTxop(tid)->Queue(mpdu);
}
uint16_t
HtFrameExchangeManager::GetSupportedBaBufferSize() const
{
return 64;
}
void
HtFrameExchangeManager::SendDelbaFrame(Mac48Address addr, uint8_t tid, bool byOriginator)
{

View File

@@ -148,13 +148,6 @@ class HtFrameExchangeManager : public QosFrameExchangeManager
* \param originator the MAC address of the originator.
*/
void SendAddBaResponse(const MgtAddBaRequestHeader* reqHdr, Mac48Address originator);
/**
* Get the maximum supported buffer size for a Block Ack agreement. This value
* is typically included in ADDBA Response frames.
*
* \return the maximum supported buffer size for a Block Ack agreement
*/
virtual uint16_t GetSupportedBaBufferSize() const;
/**
* Sends DELBA frame to cancel a block ack agreement with STA