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

wifi: Include EHT Operation in EHT AP management frames

Browse Source
This commit is contained in:
Sharan Naribole
2022-09-01 19:29:50 +02:00
committed by Stefano Avallone
parent 3d6801a88c
commit 66f838978b
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/wifi/model/ap-wifi-mac.cc
View File

@@ -882,6 +882,30 @@ ApWifiMac::GetHeOperation(uint8_t linkId) const
return operation;
}
EhtOperation
ApWifiMac::GetEhtOperation(uint8_t linkId) const
{
NS_LOG_FUNCTION(this << +linkId);
NS_ASSERT(GetEhtSupported());
EhtOperation operation;
auto remoteStationManager = GetWifiRemoteStationManager(linkId);
auto maxSpatialStream = GetWifiPhy(linkId)->GetMaxSupportedRxSpatialStreams();
for (const auto& sta : GetLink(linkId).staList)
{
if (remoteStationManager->GetEhtSupported(sta.second))
{
if (remoteStationManager->GetNumberOfSupportedStreams(sta.second) < maxSpatialStream)
{
maxSpatialStream = remoteStationManager->GetNumberOfSupportedStreams(sta.second);
}
}
}
operation.SetMaxRxNss(maxSpatialStream, 0, WIFI_EHT_MAX_MCS_INDEX);
operation.SetMaxTxNss(maxSpatialStream, 0, WIFI_EHT_MAX_MCS_INDEX);
return operation;
}
void
ApWifiMac::SendProbeResp(Mac48Address to, uint8_t linkId)
{
@@ -938,6 +962,7 @@ ApWifiMac::SendProbeResp(Mac48Address to, uint8_t linkId)
if (GetEhtSupported())
{
probe.SetEhtCapabilities(GetEhtCapabilities(linkId));
probe.SetEhtOperation(GetEhtOperation(linkId));
if (GetNLinks() > 1)
{
@@ -1037,6 +1062,7 @@ ApWifiMac::GetAssocResp(Mac48Address to, uint8_t linkId)
if (GetEhtSupported())
{
assoc.SetEhtCapabilities(GetEhtCapabilities(linkId));
assoc.SetEhtOperation(GetEhtOperation(linkId));
}
return assoc;
}
@@ -1355,6 +1381,7 @@ ApWifiMac::SendOneBeacon(uint8_t linkId)
if (GetEhtSupported())
{
beacon.SetEhtCapabilities(GetEhtCapabilities(linkId));
beacon.SetEhtOperation(GetEhtOperation(linkId));
if (GetNLinks() > 1)
{

8
src/wifi/model/ap-wifi-mac.h
View File

@@ -42,6 +42,7 @@ class MultiLinkElement;
class HtOperation;
class VhtOperation;
class HeOperation;
class EhtOperation;
class CfParameterSet;
class UniformRandomVariable;
class MgtAssocRequestHeader;
@@ -411,6 +412,13 @@ class ApWifiMac : public WifiMac
* \return the HE operation that we support
*/
HeOperation GetHeOperation(uint8_t linkId) const;
/**
* Return the EHT operation of the current AP for the given link.
*
* \param linkId the ID of the given link
* \return the EHT operation that we support
*/
EhtOperation GetEhtOperation(uint8_t linkId) const;
/**
* Return an instance of SupportedRates that contains all rates that we support
* for the given link (including HT rates).