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

wifi: Member variables of Configuration classes can be accessed directly

Browse Source
This commit is contained in:
Stefano Avallone
2024-11-06 19:37:16 +01:00
parent 94be633e59
commit 74fe3fd974
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/helper/wifi-mac-helper.cc
View File

@@ -160,10 +160,8 @@ WifiMacHelper::Create(Ptr<WifiNetDevice> device, WifiStandard standard) const
}
// create and install the AP EMLSR Manager if this is an EHT AP MLD with EMLSR activated
if (BooleanValue emlsrActivated;
standard >= WIFI_STANDARD_80211be && apMac && apMac->GetNLinks() > 1 &&
device->GetEhtConfiguration()->GetAttributeFailSafe("EmlsrActivated", emlsrActivated) &&
emlsrActivated.Get())
if (standard >= WIFI_STANDARD_80211be && apMac && apMac->GetNLinks() > 1 &&
device->GetEhtConfiguration()->m_emlsrActivated)
{
auto apEmlsrManager = m_apEmlsrManager.Create<ApEmlsrManager>();
apMac->SetApEmlsrManager(apEmlsrManager);

6
src/wifi/test/inter-bss-test-suite.cc
View File

@@ -879,15 +879,15 @@ TestInterBssConstantObssPdAlgo::RunOne()
Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration();
if (i == 0)
{
heConfiguration->SetAttribute("BssColor", UintegerValue(m_bssColor1));
heConfiguration->m_bssColor = m_bssColor1;
}
else if (i == 1)
{
heConfiguration->SetAttribute("BssColor", UintegerValue(m_bssColor2));
heConfiguration->m_bssColor = m_bssColor2;
}
else
{
heConfiguration->SetAttribute("BssColor", UintegerValue(m_bssColor3));
heConfiguration->m_bssColor = m_bssColor3;
}
}

9
src/wifi/test/wifi-mlo-test.cc
View File

@@ -853,13 +853,11 @@ MultiLinkSetupTest::DoSetup()
MultiLinkOperationsTestBase::DoSetup();
m_staMacs[0]->SetAttribute("ActiveProbing", BooleanValue(m_scanType == WifiScanType::ACTIVE));
m_apMac->GetEhtConfiguration()->SetAttribute("TidToLinkMappingNegSupport",
EnumValue(m_apNegSupport));
m_apMac->GetEhtConfiguration()->m_tidLinkMappingSupport = m_apNegSupport;
// For non-AP MLD, it does not make sense to set the negotiation type to 0 (unless the AP MLD
// also advertises 0) or 1 (the AP MLD is discarded if it advertises a support of 3)
auto staEhtConfig = m_staMacs[0]->GetEhtConfiguration();
staEhtConfig->SetAttribute("TidToLinkMappingNegSupport",
EnumValue(WifiTidToLinkMappingNegSupport::ANY_LINK_SET));
staEhtConfig->m_tidLinkMappingSupport = WifiTidToLinkMappingNegSupport::ANY_LINK_SET;
staEhtConfig->SetAttribute("TidToLinkMappingDl", StringValue(m_dlTidLinkMappingStr));
staEhtConfig->SetAttribute("TidToLinkMappingUl", StringValue(m_ulTidLinkMappingStr));
@@ -954,8 +952,7 @@ MultiLinkSetupTest::DoSetup()
// are compatible
for (auto staMac : m_staMacs)
{
staMac->GetVhtConfiguration()->SetAttribute("Support160MHzOperation",
BooleanValue(m_support160MHzOp));
staMac->GetVhtConfiguration()->m_160MHzSupported = m_support160MHzOp;
uint8_t linkId = 0;
for (const auto& str : m_staChannels)
{

2
src/wifi/test/wifi-phy-mu-mimo-test.cc
View File

@@ -1536,7 +1536,7 @@ TestUlMuMimoPhyTransmission::SetBssColor(Ptr<WifiPhy> phy, uint8_t bssColor)
{
Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice>(phy->GetDevice());
Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration();
heConfiguration->SetAttribute("BssColor", UintegerValue(bssColor));
heConfiguration->m_bssColor = bssColor;
}
void

4
src/wifi/test/wifi-phy-ofdma-test.cc
View File

@@ -3756,7 +3756,7 @@ TestUlOfdmaPhyTransmission::SetBssColor(Ptr<WifiPhy> phy, uint8_t bssColor)
{
Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice>(phy->GetDevice());
Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration();
heConfiguration->SetAttribute("BssColor", UintegerValue(bssColor));
heConfiguration->m_bssColor = bssColor;
}
void
@@ -5714,7 +5714,7 @@ TestUlOfdmaPowerControl::DoSetup()
TimeValue(MicroSeconds(1024 * 600)));
m_apDev = DynamicCast<WifiNetDevice>(wifi.Install(spectrumPhy, mac, apNode).Get(0));
NS_ASSERT(m_apDev);
m_apDev->GetHeConfiguration()->SetAttribute("BssColor", UintegerValue(m_bssColor));
m_apDev->GetHeConfiguration()->m_bssColor = m_bssColor;
m_phyAp = DynamicCast<SpectrumWifiPhy>(m_apDev->GetPhy());
NS_ASSERT(m_phyAp);
// ReceiveOkCallback of AP will be set to corresponding test's method once BA sessions have been