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

wifi: Use scheduler to block packets while waiting for ADDBA response

Browse Source
This commit is contained in:
Stefano Avallone
2023-02-13 11:32:36 +01:00
parent cd401ecf26
commit 3b174969b2
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/wifi/model/qos-txop.cc
View File

@@ -29,6 +29,7 @@
#include "mpdu-aggregator.h"
#include "msdu-aggregator.h"
#include "qos-blocked-destinations.h"
#include "wifi-mac-queue-scheduler.h"
#include "wifi-mac-queue.h"
#include "wifi-mac-trailer.h"
#include "wifi-phy.h"
@@ -112,9 +113,23 @@ QosTxop::QosTxop(AcIndex ac)
m_baManager = CreateObject<BlockAckManager>();
m_baManager->SetQueue(m_queue);
m_baManager->SetBlockDestinationCallback(
MakeCallback(&QosBlockedDestinations::Block, m_qosBlockedDestinations));
Callback<void, Mac48Address, uint8_t>([this](Mac48Address recipient, uint8_t tid) {
m_mac->GetMacQueueScheduler()->BlockQueues(WifiQueueBlockedReason::WAITING_ADDBA_RESP,
m_ac,
{WIFI_QOSDATA_QUEUE},
recipient,
m_mac->GetAddress(),
{tid});
}));
m_baManager->SetUnblockDestinationCallback(
MakeCallback(&QosBlockedDestinations::Unblock, m_qosBlockedDestinations));
Callback<void, Mac48Address, uint8_t>([this](Mac48Address recipient, uint8_t tid) {
m_mac->GetMacQueueScheduler()->UnblockQueues(WifiQueueBlockedReason::WAITING_ADDBA_RESP,
m_ac,
{WIFI_QOSDATA_QUEUE},
recipient,
m_mac->GetAddress(),
{tid});
}));
m_queue->TraceConnectWithoutContext(
"Expired",
MakeCallback(&BlockAckManager::NotifyDiscardedMpdu, m_baManager));

5
src/wifi/model/wifi-mac-queue-scheduler.h
View File

@@ -41,7 +41,8 @@ class WifiMac;
*/
enum class WifiQueueBlockedReason : uint8_t
{
REASONS_COUNT = 0
WAITING_ADDBA_RESP = 0,
REASONS_COUNT
};
/**
@@ -56,6 +57,8 @@ operator<<(std::ostream& os, WifiQueueBlockedReason reason)
{
switch (reason)
{
case WifiQueueBlockedReason::WAITING_ADDBA_RESP:
return (os << "WAITING_ADDBA_RESP");
case WifiQueueBlockedReason::REASONS_COUNT:
return (os << "REASONS_COUNT");
default: