wifi: Use correct address to retrieve buffer status

This commit is contained in:
Stefano Avallone
2024-06-05 16:26:05 +02:00
committed by Stefano Avallone
parent 357c1cf398
commit d89a590be2
3 changed files with 6 additions and 3 deletions

View File

@@ -195,7 +195,7 @@ cpp_examples = [
"True",
),
(
"wifi-eht-network --simulationTime=0.25s --udp=0 --downlink=0 --useRts=0 --nStations=4 --dlAckType=AGGR-MU-BAR --enableUlOfdma=1 --enableBsrp=1 --mpduBufferSize=1024 --mcs=7 --muSchedAccessReqInterval=45ms --frequency2=6 --minExpectedThroughput=70 --maxExpectedThroughput=550",
"wifi-eht-network --simulationTime=0.25s --udp=0 --downlink=0 --useRts=0 --nStations=4 --dlAckType=AGGR-MU-BAR --enableUlOfdma=1 --enableBsrp=1 --mpduBufferSize=1024 --mcs=8 --muSchedAccessReqInterval=45ms --frequency2=6 --minExpectedThroughput=50 --maxExpectedThroughput=550",
"True",
"True",
),

View File

@@ -1096,7 +1096,8 @@ HtFrameExchangeManager::FinalizeMacHeader(Ptr<const WifiPsdu> psdu)
// set the Queue Size subfield of the QoS Control field
if (!queueSizeForTid[tid].has_value())
{
queueSizeForTid[tid] = edca->GetQosQueueSize(tid, hdr.GetAddr1());
queueSizeForTid[tid] =
edca->GetQosQueueSize(tid, mpdu->GetOriginal()->GetHeader().GetAddr1());
}
hdr.SetQosEosp();

View File

@@ -555,7 +555,9 @@ QosFrameExchangeManager::ForwardMpduDown(Ptr<WifiMpdu> mpdu, WifiTxVector& txVec
{
uint8_t tid = hdr.GetQosTid();
hdr.SetQosEosp();
hdr.SetQosQueueSize(m_mac->GetQosTxop(tid)->GetQosQueueSize(tid, hdr.GetAddr1()));
hdr.SetQosQueueSize(
m_mac->GetQosTxop(tid)->GetQosQueueSize(tid,
mpdu->GetOriginal()->GetHeader().GetAddr1()));
}
FrameExchangeManager::ForwardMpduDown(mpdu, txVector);
}