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

wifi: Fix setting of max supported channel width in (V)HT Capabilities

Browse Source
This commit is contained in:
Stefano Avallone
2022-05-04 13:54:42 +02:00
parent 5249d472c5
commit cad3108316
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1214,7 +1214,7 @@ WifiMac::GetHtCapabilities (void) const
bool sgiSupported = htConfiguration->GetShortGuardIntervalSupported ();
capabilities.SetHtSupported (1);
capabilities.SetLdpc (htConfiguration->GetLdpcSupported ());
capabilities.SetSupportedChannelWidth (GetWifiPhy ()->GetChannelWidth () >= 40);
capabilities.SetSupportedChannelWidth (htConfiguration->Get40MHzOperationSupported () ? 1 : 0);
capabilities.SetShortGuardInterval20 (sgiSupported);
capabilities.SetShortGuardInterval40 (GetWifiPhy ()->GetChannelWidth () >= 40 && sgiSupported);
// Set Maximum A-MSDU Length subfield
@@ -1267,17 +1267,12 @@ WifiMac::GetVhtCapabilities (void) const
if (GetVhtSupported ())
{
Ptr<HtConfiguration> htConfiguration = GetHtConfiguration ();
NS_ABORT_MSG_IF (!htConfiguration->Get40MHzOperationSupported (),
"VHT stations have to support 40 MHz operation");
Ptr<VhtConfiguration> vhtConfiguration = GetVhtConfiguration ();
bool sgiSupported = htConfiguration->GetShortGuardIntervalSupported ();
capabilities.SetVhtSupported (1);
if (GetWifiPhy ()->GetChannelWidth () == 160)
{
capabilities.SetSupportedChannelWidthSet (1);
}
else
{
capabilities.SetSupportedChannelWidthSet (0);
}
capabilities.SetSupportedChannelWidthSet (vhtConfiguration->Get160MHzOperationSupported () ? 1 : 0);
// Set Maximum MPDU Length subfield
uint16_t maxAmsduSize = std::max ({m_voMaxAmsduSize, m_viMaxAmsduSize,
m_beMaxAmsduSize, m_bkMaxAmsduSize});