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

wifi: Add missing condition to HtPhy::GetCcaIndication to skip CCA sensitivity check if PPDU does not occupy neither primary nor secondary 20 MHz subchannels

Browse Source
This commit is contained in:
Sébastien Deronne
2022-08-07 13:00:50 +02:00
parent 92108743df
commit a10f0b9ad9
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/wifi/model/ht/ht-phy.cc
View File

@@ -797,7 +797,7 @@ HtPhy::GetCcaIndication (const Ptr<const WifiPpdu> ppdu)
{
return std::make_pair (delayUntilCcaEnd, WIFI_CHANLIST_PRIMARY); //if Primary is busy, ignore CCA for Secondary
}
if (ppdu != nullptr)
if (ppdu)
{
const uint16_t primaryWidth = 20;
uint16_t p20MinFreq =
@@ -814,11 +814,19 @@ HtPhy::GetCcaIndication (const Ptr<const WifiPpdu> ppdu)
}
}
ccaThresholdDbm = GetCcaThreshold (ppdu, WIFI_CHANLIST_SECONDARY);
delayUntilCcaEnd = GetDelayUntilCcaEnd (ccaThresholdDbm, GetSecondaryBand (20));
if (delayUntilCcaEnd.IsStrictlyPositive ())
const uint16_t secondaryWidth = 20;
uint16_t s20MinFreq =
m_wifiPhy->GetOperatingChannel ().GetSecondaryChannelCenterFrequency (secondaryWidth) - (secondaryWidth / 2);
uint16_t s20MaxFreq =
m_wifiPhy->GetOperatingChannel ().GetSecondaryChannelCenterFrequency (secondaryWidth) + (secondaryWidth / 2);
if (!ppdu || ppdu->DoesOverlapChannel (s20MinFreq, s20MaxFreq))
{
return std::make_pair (delayUntilCcaEnd, WIFI_CHANLIST_SECONDARY);
ccaThresholdDbm = GetCcaThreshold (ppdu, WIFI_CHANLIST_SECONDARY);
delayUntilCcaEnd = GetDelayUntilCcaEnd (ccaThresholdDbm, GetSecondaryBand (20));
if (delayUntilCcaEnd.IsStrictlyPositive ())
{
return std::make_pair (delayUntilCcaEnd, WIFI_CHANLIST_SECONDARY);
}
}
return std::nullopt;

6
src/wifi/model/vht/vht-phy.cc
View File

@@ -532,7 +532,7 @@ VhtPhy::GetMaxPsduSize (void) const
double
VhtPhy::GetCcaThreshold (const Ptr<const WifiPpdu> ppdu, WifiChannelListType channelType) const
{
if (ppdu != nullptr)
if (ppdu)
{
const uint16_t ppduBw = ppdu->GetTxVector ().GetChannelWidth ();
switch (channelType)
@@ -586,7 +586,7 @@ VhtPhy::GetCcaIndication (const Ptr<const WifiPpdu> ppdu)
return std::make_pair (delayUntilCcaEnd, WIFI_CHANLIST_PRIMARY); //if Primary is busy, ignore CCA for Secondary
}
if (ppdu != nullptr)
if (ppdu)
{
const uint16_t primaryWidth = 20;
uint16_t p20MinFreq =
@@ -604,7 +604,7 @@ VhtPhy::GetCcaIndication (const Ptr<const WifiPpdu> ppdu)
}
std::vector<uint16_t> secondaryWidthsToCheck;
if (ppdu != nullptr)
if (ppdu)
{
for (const auto& secondaryChannel : secondaryChannels)
{