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

wifi: Move check on m_useNonErpProtection in WifiRemoteStationManager::NeedCtsToSelf

Browse Source
This commit is contained in:
Sébastien Deronne
2023-09-18 18:05:38 +02:00
parent ec0fb36d6a
commit 4a50f4e57d
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wifi/model/wifi-default-protection-manager.cc
View File

@@ -212,8 +212,7 @@ WifiDefaultProtectionManager::GetPsduProtection(const WifiMacHeader& hdr,
}
// check if CTS-to-Self is needed
if (GetWifiRemoteStationManager()->GetUseNonErpProtection() &&
GetWifiRemoteStationManager()->NeedCtsToSelf(txParams.m_txVector))
if (GetWifiRemoteStationManager()->NeedCtsToSelf(txParams.m_txVector))
{
auto protection = std::make_unique<WifiCtsToSelfProtection>();
protection->ctsTxVector = GetWifiRemoteStationManager()->GetCtsToSelfTxVector();

26
src/wifi/model/wifi-remote-station-manager.cc
View File

@@ -1221,31 +1221,31 @@ WifiRemoteStationManager::NeedRts(const WifiMacHeader& header, const WifiTxParam
bool
WifiRemoteStationManager::NeedCtsToSelf(const WifiTxVector& txVector)
{
WifiMode mode = txVector.GetMode();
NS_LOG_FUNCTION(this << mode);
if (m_erpProtectionMode == CTS_TO_SELF &&
((mode.GetModulationClass() == WIFI_MOD_CLASS_ERP_OFDM) ||
(mode.GetModulationClass() == WIFI_MOD_CLASS_HT) ||
(mode.GetModulationClass() == WIFI_MOD_CLASS_VHT) ||
(mode.GetModulationClass() == WIFI_MOD_CLASS_HE) ||
(mode.GetModulationClass() == WIFI_MOD_CLASS_EHT)) &&
m_useNonErpProtection)
NS_LOG_FUNCTION(this << txVector);
if (m_useNonErpProtection && m_erpProtectionMode == CTS_TO_SELF &&
((txVector.GetModulationClass() == WIFI_MOD_CLASS_ERP_OFDM) ||
(txVector.GetModulationClass() == WIFI_MOD_CLASS_HT) ||
(txVector.GetModulationClass() == WIFI_MOD_CLASS_VHT) ||
(txVector.GetModulationClass() == WIFI_MOD_CLASS_HE) ||
(txVector.GetModulationClass() == WIFI_MOD_CLASS_EHT)))
{
NS_LOG_DEBUG(
"WifiRemoteStationManager::NeedCtsToSelf returning true to protect non-ERP stations");
return true;
}
else if (m_htProtectionMode == CTS_TO_SELF &&
((mode.GetModulationClass() == WIFI_MOD_CLASS_HT) ||
(mode.GetModulationClass() == WIFI_MOD_CLASS_VHT)) &&
((txVector.GetModulationClass() == WIFI_MOD_CLASS_HT) ||
(txVector.GetModulationClass() == WIFI_MOD_CLASS_VHT)) &&
m_useNonHtProtection && !(m_erpProtectionMode != CTS_TO_SELF && m_useNonErpProtection))
{
NS_LOG_DEBUG(
"WifiRemoteStationManager::NeedCtsToSelf returning true to protect non-HT stations");
return true;
}
else if (!m_useNonErpProtection)
// FIXME: commented out for now
/*else if (!m_useNonErpProtection)
{
const auto mode = txVector.GetMode();
// search for the BSS Basic Rate set, if the used mode is in the basic set then there is no
// need for CTS To Self
for (auto i = m_bssBasicRateSet.begin(); i != m_bssBasicRateSet.end(); i++)
@@ -1271,7 +1271,7 @@ WifiRemoteStationManager::NeedCtsToSelf(const WifiTxVector& txVector)
}
NS_LOG_DEBUG("WifiRemoteStationManager::NeedCtsToSelf returning true");
return true;
}
}*/
return false;
}