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

wifi: Fix NeedSetupBlockAck() for STAs operating on a 6 GHz link only

Browse Source 
Based on a patch from Rami Abdallah
This commit is contained in:
Stefano Avallone
2024-05-17 19:04:34 +02:00
parent bef9d87431
commit 0258df2f41
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/wifi/model/ht/ht-frame-exchange-manager.cc
View File

@@ -111,19 +111,31 @@ bool
HtFrameExchangeManager::NeedSetupBlockAck(Mac48Address recipient, uint8_t tid)
{
Ptr<QosTxop> qosTxop = m_mac->GetQosTxop(tid);
auto agreement = qosTxop->GetBaManager()->GetAgreementAsOriginator(recipient, tid);
bool establish;
if (!m_mac->GetHtSupported(recipient) || (agreement && !agreement->get().IsReset()))
// NOLINTBEGIN(bugprone-branch-clone)
if (!m_mac->GetHtConfiguration() ||
(!GetWifiRemoteStationManager()->GetHtSupported(recipient) &&
!GetWifiRemoteStationManager()->GetStationHe6GhzCapabilities(recipient)))
{
// no Block Ack if this device or the recipient are not HT STAs and do not operate
// in the 6 GHz band
establish = false;
}
else if (auto agreement = qosTxop->GetBaManager()->GetAgreementAsOriginator(recipient, tid);
agreement && !agreement->get().IsReset())
{
// Block Ack agreement already established
establish = false;
}
// NOLINTEND(bugprone-branch-clone)
else
{
WifiContainerQueueId queueId{WIFI_QOSDATA_QUEUE, WIFI_UNICAST, recipient, tid};
uint32_t packets = qosTxop->GetWifiMacQueue()->GetNPackets(queueId);
establish =
((qosTxop->GetBlockAckThreshold() > 0 && packets >= qosTxop->GetBlockAckThreshold()) ||
(m_mac->Is6GhzBand(m_linkId) ||
(qosTxop->GetBlockAckThreshold() > 0 && packets >= qosTxop->GetBlockAckThreshold()) ||
(m_mpduAggregator->GetMaxAmpduSize(recipient, tid, WIFI_MOD_CLASS_HT) > 0 &&
packets > 1) ||
m_mac->GetVhtConfiguration());