diff --git a/src/wifi/model/txop.cc b/src/wifi/model/txop.cc index ac9aaa1c2..e739b7003 100644 --- a/src/wifi/model/txop.cc +++ b/src/wifi/model/txop.cc @@ -515,9 +515,7 @@ void Txop::Queue(Ptr mpdu) { NS_LOG_FUNCTION(this << *mpdu); - const auto linkIds = - m_mac->GetMacQueueScheduler()->GetLinkIds(m_queue->GetAc(), - WifiMacQueueContainer::GetQueueId(mpdu)); + const auto linkIds = m_mac->GetMacQueueScheduler()->GetLinkIds(m_queue->GetAc(), mpdu); for (const auto linkId : linkIds) { if (m_mac->GetChannelAccessManager(linkId)->NeedBackoffUponAccess(this)) diff --git a/src/wifi/model/wifi-mac-queue-scheduler-impl.h b/src/wifi/model/wifi-mac-queue-scheduler-impl.h index 21c72055d..26ca8ef94 100644 --- a/src/wifi/model/wifi-mac-queue-scheduler-impl.h +++ b/src/wifi/model/wifi-mac-queue-scheduler-impl.h @@ -73,7 +73,7 @@ class WifiMacQueueSchedulerImpl : public WifiMacQueueScheduler uint8_t linkId, const WifiContainerQueueId& prevQueueId) final; /** \copydoc ns3::WifiMacQueueScheduler::GetLinkIds */ - std::list GetLinkIds(AcIndex ac, const WifiContainerQueueId& queueId) final; + std::list GetLinkIds(AcIndex ac, Ptr mpdu) final; /** \copydoc ns3::WifiMacQueueScheduler::SetLinkIds */ void SetLinkIds(AcIndex ac, const WifiContainerQueueId& queueId, @@ -363,10 +363,9 @@ WifiMacQueueSchedulerImpl::SetPriority(AcIndex ac, template std::list -WifiMacQueueSchedulerImpl::GetLinkIds(AcIndex ac, - const WifiContainerQueueId& queueId) +WifiMacQueueSchedulerImpl::GetLinkIds(AcIndex ac, Ptr mpdu) { - auto queueInfoIt = InitQueueInfo(ac, queueId); + auto queueInfoIt = InitQueueInfo(ac, WifiMacQueueContainer::GetQueueId(mpdu)); if (queueInfoIt->second.linkIds.empty()) { diff --git a/src/wifi/model/wifi-mac-queue-scheduler.h b/src/wifi/model/wifi-mac-queue-scheduler.h index 6dd3ff865..5839e756a 100644 --- a/src/wifi/model/wifi-mac-queue-scheduler.h +++ b/src/wifi/model/wifi-mac-queue-scheduler.h @@ -81,14 +81,14 @@ class WifiMacQueueScheduler : public Object const WifiContainerQueueId& prevQueueId) = 0; /** - * Get the list of the IDs of the links the given container queue (belonging to - * the given Access Category) is associated with. + * Get the list of the IDs of the links the given MPDU (belonging to the given + * Access Category) can be sent over. * * \param ac the given Access Category - * \param queueId the given container queue - * \return the list of the IDs of the links the given container queue is associated with + * \param mpdu the given MPDU + * \return the list of the IDs of the links the given MPDU can be sent over */ - virtual std::list GetLinkIds(AcIndex ac, const WifiContainerQueueId& queueId) = 0; + virtual std::list GetLinkIds(AcIndex ac, Ptr mpdu) = 0; /** * Set the list of the IDs of the links the given container queue (belonging to * the given Access Category) is associated with.