F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Add a WifiMac attribute to configure BlockAck buffer size

Browse Source 
The value of this attribute can be easily capped to the maximum allowed value based
on the supported standard.
This commit is contained in:
Stefano Avallone
2023-08-14 16:15:07 +02:00
parent e6e0d9f947
commit 92580cb106
5 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/wireless/wifi-eht-network.cc
View File

@@ -438,9 +438,8 @@ main(int argc, char* argv[])
Config::Set(
"/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/HeConfiguration/GuardInterval",
TimeValue(NanoSeconds(gi)));
Config::Set(
"/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/HeConfiguration/MpduBufferSize",
UintegerValue(useExtendedBlockAck ? 256 : 64));
Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/MpduBufferSize",
UintegerValue(useExtendedBlockAck ? 256 : 64));
// mobility.
MobilityHelper mobility;

19
examples/wireless/wifi-he-network.cc
View File

@@ -250,11 +250,8 @@ main(int argc, char* argv[])
StringValue(ossDataMode.str()),
"ControlMode",
ctrlRate);
// Set guard interval and MPDU buffer size
wifi.ConfigHeOptions("GuardInterval",
TimeValue(NanoSeconds(gi)),
"MpduBufferSize",
UintegerValue(useExtendedBlockAck ? 256 : 64));
// Set guard interval
wifi.ConfigHeOptions("GuardInterval", TimeValue(NanoSeconds(gi)));
Ssid ssid = Ssid("ns3-80211ax");
@@ -277,7 +274,11 @@ main(int argc, char* argv[])
phy.SetPcapDataLinkType(WifiPhyHelper::DLT_IEEE802_11_RADIO);
phy.SetChannel(spectrumChannel);
mac.SetType("ns3::StaWifiMac", "Ssid", SsidValue(ssid));
mac.SetType("ns3::StaWifiMac",
"Ssid",
SsidValue(ssid),
"MpduBufferSize",
UintegerValue(useExtendedBlockAck ? 256 : 64));
phy.Set("ChannelSettings", StringValue(channelStr));
staDevices = wifi.Install(phy, mac, wifiStaNodes);
@@ -305,7 +306,11 @@ main(int argc, char* argv[])
phy.SetPcapDataLinkType(WifiPhyHelper::DLT_IEEE802_11_RADIO);
phy.SetChannel(channel.Create());
mac.SetType("ns3::StaWifiMac", "Ssid", SsidValue(ssid));
mac.SetType("ns3::StaWifiMac",
"Ssid",
SsidValue(ssid),
"MpduBufferSize",
UintegerValue(useExtendedBlockAck ? 256 : 64));
phy.Set("ChannelSettings", StringValue(channelStr));
staDevices = wifi.Install(phy, mac, wifiStaNodes);

3
src/wifi/model/ht/ht-frame-exchange-manager.cc
View File

@@ -238,7 +238,8 @@ HtFrameExchangeManager::SendAddBaResponse(const MgtAddBaRequestHeader* reqHdr,
auto tid = reqHdr->GetTid();
respHdr.SetTid(tid);
respHdr.SetBufferSize(GetSupportedBaBufferSize());
auto bufferSize = std::min(m_mac->GetMpduBufferSize(), m_mac->GetMaxBaBufferSize(originator));
respHdr.SetBufferSize(bufferSize);
respHdr.SetTimeout(reqHdr->GetTimeout());
WifiActionHeader actionHdr;

28
src/wifi/model/wifi-mac.cc
View File

@@ -120,6 +120,14 @@ WifiMac::GetTypeId()
PointerValue(),
MakePointerAccessor(&WifiMac::GetBKQueue),
MakePointerChecker<QosTxop>())
.AddAttribute(
"MpduBufferSize",
"The size (in number of MPDUs) of the buffer used for each BlockAck "
"agreement in which this node is a recipient. The provided value is "
"capped to the maximum allowed value based on the supported standard.",
UintegerValue(64),
MakeUintegerAccessor(&WifiMac::GetMpduBufferSize, &WifiMac::SetMpduBufferSize),
MakeUintegerChecker<uint16_t>(1, 1024))
.AddAttribute("VO_MaxAmsduSize",
"Maximum length in bytes of an A-MSDU for AC_VO access class "
"(capped to 7935 for HT PPDUs and 11398 for VHT/HE/EHT PPDUs). "
@@ -420,6 +428,11 @@ void
WifiMac::SetDevice(const Ptr<WifiNetDevice> device)
{
m_device = device;
if (GetHtSupported())
{
// the configured BlockAck buffer size can now be capped
m_mpduBufferSize = std::min(m_mpduBufferSize, GetMaxBaBufferSize());
}
}
Ptr<WifiNetDevice>
@@ -1846,6 +1859,21 @@ WifiMac::GetMaxBaBufferSize(std::optional<Mac48Address> address) const
return 64;
}
void
WifiMac::SetMpduBufferSize(uint16_t size)
{
NS_LOG_FUNCTION(this << size);
// the cap can be computed if the device has been configured
m_mpduBufferSize = m_device ? std::min(size, GetMaxBaBufferSize()) : size;
}
uint16_t
WifiMac::GetMpduBufferSize() const
{
return m_mpduBufferSize;
}
void
WifiMac::SetVoBlockAckThreshold(uint8_t threshold)
{

14
src/wifi/model/wifi-mac.h
View File

@@ -694,6 +694,18 @@ class WifiMac : public Object
*/
uint16_t GetMaxBaBufferSize(std::optional<Mac48Address> address = std::nullopt) const;
/**
* \param size the size (in number of MPDUs) of the buffer used for each BlockAck
* agreement in which this node is a recipient
*/
void SetMpduBufferSize(uint16_t size);
/**
* \return the size (in number of MPDUs) of the buffer used for each BlockAck
* agreement in which this node is a recipient
*/
uint16_t GetMpduBufferSize() const;
/**
* Get the TID-to-Link Mapping negotiated with the given MLD (if any) for the given direction.
* An empty mapping indicates the default mapping.
@@ -1070,6 +1082,8 @@ class WifiMac : public Object
uint32_t m_beMaxAmpduSize; ///< maximum A-MPDU size for AC_BE (in bytes)
uint32_t m_bkMaxAmpduSize; ///< maximum A-MPDU size for AC_BK (in bytes)
uint16_t m_mpduBufferSize; //!< BlockAck buffer size (in number of MPDUs)
/// @brief DL TID-to-Link Mapping negotiated with an MLD (identified by its MLD address)
std::unordered_map<Mac48Address, WifiTidLinkMapping, WifiAddressHash> m_dlTidLinkMappings;
/// @brief UL TID-to-Link Mapping negotiated with an MLD (identified by its MLD address)