diff --git a/src/wifi/model/txop.cc b/src/wifi/model/txop.cc index a39176d09..829eecf58 100644 --- a/src/wifi/model/txop.cc +++ b/src/wifi/model/txop.cc @@ -590,16 +590,6 @@ Txop::StartAccessAfterEvent(uint8_t linkId, bool hadFramesToTransmit, bool check m_mac->GetChannelAccessManager(linkId)->RequestAccess(this); } -void -Txop::StartAccessIfNeeded(uint8_t linkId) -{ - NS_LOG_FUNCTION(this << +linkId); - if (HasFramesToTransmit(linkId) && GetLink(linkId).access == NOT_REQUESTED) - { - m_mac->GetChannelAccessManager(linkId)->RequestAccess(this); - } -} - void Txop::DoInitialize() { diff --git a/src/wifi/model/txop.h b/src/wifi/model/txop.h index 9d16c7209..012656a5a 100644 --- a/src/wifi/model/txop.h +++ b/src/wifi/model/txop.h @@ -412,13 +412,6 @@ class Txop : public Object */ void StartAccessAfterEvent(uint8_t linkId, bool hadFramesToTransmit, bool checkMediumBusy); - /** - * Request access from Txop on the given link if needed. - * - * \param linkId the ID of the given link - */ - void StartAccessIfNeeded(uint8_t linkId); - /** * \param nSlots the number of slots of the backoff. * \param linkId the ID of the given link diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 93b11c34b..9f9ae2bbf 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -1477,21 +1477,6 @@ WifiMac::UnblockUnicastTxOnLinks(WifiQueueBlockedReason reason, } } -void -WifiMac::StartAccessIfNeeded(uint8_t linkId) -{ - NS_LOG_FUNCTION(this << linkId); - - if (m_txop) - { - m_txop->StartAccessIfNeeded(linkId); - } - for (const auto& [acIndex, edca] : m_edca) - { - edca->StartAccessIfNeeded(linkId); - } -} - void WifiMac::Enqueue(Ptr packet, Mac48Address to, Mac48Address from) { diff --git a/src/wifi/model/wifi-mac.h b/src/wifi/model/wifi-mac.h index 3d8bb4c59..ef6001bc8 100644 --- a/src/wifi/model/wifi-mac.h +++ b/src/wifi/model/wifi-mac.h @@ -368,13 +368,6 @@ class WifiMac : public Object */ virtual bool SupportsSendFrom() const; - /** - * Request channel access from DCF/EDCAFs on the given link if needed. - * - * \param linkId the ID of the given link - */ - void StartAccessIfNeeded(uint8_t linkId); - /** * \param phys the physical layers attached to this MAC. */