diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc index 545af2486..c24b39553 100644 --- a/src/wifi/model/block-ack-manager.cc +++ b/src/wifi/model/block-ack-manager.cc @@ -65,7 +65,6 @@ BlockAckManager::DoDispose() BlockAckManager::OriginatorAgreementOptConstRef BlockAckManager::GetAgreementAsOriginator(const Mac48Address& recipient, uint8_t tid) const { - NS_LOG_FUNCTION(this << recipient << +tid); if (auto it = m_originatorAgreements.find({recipient, tid}); it != m_originatorAgreements.end()) { return std::cref(it->second.first); @@ -77,7 +76,6 @@ BlockAckManager::GetAgreementAsOriginator(const Mac48Address& recipient, uint8_t BlockAckManager::RecipientAgreementOptConstRef BlockAckManager::GetAgreementAsRecipient(const Mac48Address& originator, uint8_t tid) const { - NS_LOG_FUNCTION(this << originator << +tid); if (auto it = m_recipientAgreements.find({originator, tid}); it != m_recipientAgreements.end()) { return std::cref(it->second); @@ -274,7 +272,6 @@ BlockAckManager::StorePacket(Ptr mpdu) uint32_t BlockAckManager::GetNBufferedPackets(const Mac48Address& recipient, uint8_t tid) const { - NS_LOG_FUNCTION(this << recipient << +tid); auto it = m_originatorAgreements.find({recipient, tid}); if (it == m_originatorAgreements.end()) { @@ -634,10 +631,8 @@ BlockAckManager::NotifyGotMpdu(Ptr mpdu) CtrlBAckRequestHeader BlockAckManager::GetBlockAckReqHeader(const Mac48Address& recipient, uint8_t tid) const { - NS_LOG_FUNCTION(this << recipient << +tid); auto it = m_originatorAgreements.find({recipient, tid}); NS_ASSERT(it != m_originatorAgreements.end()); - CtrlBAckRequestHeader reqHdr; reqHdr.SetType((*it).second.first.GetBlockAckReqType()); reqHdr.SetTidInfo(tid); diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 7a5ad8cdd..b9d279acd 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -2175,16 +2175,13 @@ WifiMac::SetBkBlockAckInactivityTimeout(uint16_t timeout) ExtendedCapabilities WifiMac::GetExtendedCapabilities() const { - NS_LOG_FUNCTION(this); ExtendedCapabilities capabilities; - // TODO: to be completed return capabilities; } HtCapabilities WifiMac::GetHtCapabilities(uint8_t linkId) const { - NS_LOG_FUNCTION(this << +linkId); NS_ASSERT(GetHtSupported(linkId)); HtCapabilities capabilities; @@ -2243,7 +2240,6 @@ WifiMac::GetHtCapabilities(uint8_t linkId) const VhtCapabilities WifiMac::GetVhtCapabilities(uint8_t linkId) const { - NS_LOG_FUNCTION(this << +linkId); NS_ASSERT(GetVhtSupported(linkId)); VhtCapabilities capabilities; @@ -2324,7 +2320,6 @@ WifiMac::GetVhtCapabilities(uint8_t linkId) const HeCapabilities WifiMac::GetHeCapabilities(uint8_t linkId) const { - NS_LOG_FUNCTION(this << +linkId); NS_ASSERT(GetHeSupported()); HeCapabilities capabilities; @@ -2416,7 +2411,6 @@ WifiMac::GetHe6GhzBandCapabilities(uint8_t linkId) const EhtCapabilities WifiMac::GetEhtCapabilities(uint8_t linkId) const { - NS_LOG_FUNCTION(this << +linkId); NS_ASSERT(GetEhtSupported()); EhtCapabilities capabilities; diff --git a/src/wifi/model/wifi-tx-parameters.cc b/src/wifi/model/wifi-tx-parameters.cc index a7cac491e..42d9faa33 100644 --- a/src/wifi/model/wifi-tx-parameters.cc +++ b/src/wifi/model/wifi-tx-parameters.cc @@ -270,8 +270,6 @@ WifiTxParameters::GetSizeIfAggregateMsdu(Ptr msdu) const uint32_t WifiTxParameters::GetSize(Mac48Address receiver) const { - NS_LOG_FUNCTION(this << receiver); - auto infoIt = m_info.find(receiver); if (infoIt == m_info.end())