From c2a5175b90f844fc897dd7c844ae3e980b1ee9ef Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Fri, 14 Jun 2019 19:23:35 +0300 Subject: [PATCH] wifi: remove unused BlockAckManager::m_maxDelay --- src/wifi/model/block-ack-manager.cc | 7 ------- src/wifi/model/block-ack-manager.h | 8 -------- src/wifi/model/qos-txop.cc | 1 - 3 files changed, 16 deletions(-) diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc index 4f578f99e..a9caac856 100644 --- a/src/wifi/model/block-ack-manager.cc +++ b/src/wifi/model/block-ack-manager.cc @@ -817,13 +817,6 @@ BlockAckManager::SetStartingSequence (Mac48Address recipient, uint8_t tid, uint1 agreementIt->second.first.SetStartingSequence (startingSeq); } -void -BlockAckManager::SetMaxPacketDelay (Time maxDelay) -{ - NS_LOG_FUNCTION (this << maxDelay); - m_maxDelay = maxDelay; -} - void BlockAckManager::SetBlockAckInactivityCallback (Callback callback) { diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h index 8dee23882..5f6369a94 100644 --- a/src/wifi/model/block-ack-manager.h +++ b/src/wifi/model/block-ack-manager.h @@ -304,13 +304,6 @@ public: * See ctrl-headers.h for more details. */ void SetBlockAckType (BlockAckType bAckType); - /** - * \param maxDelay Max delay for a buffered packet. - * - * This method is always called by ns3::WifiMacQueue object and sets max delay equals - * to ns3:WifiMacQueue delay value. - */ - void SetMaxPacketDelay (Time maxDelay); /** * Set block ack inactivity callback @@ -523,7 +516,6 @@ private: uint8_t m_blockAckThreshold; ///< block ack threshold BlockAckType m_blockAckType; ///< block ack type - Time m_maxDelay; ///< maximum delay Ptr m_txMiddle; ///< the MacTxMiddle Mac48Address m_address; ///< address Ptr m_queue; ///< queue diff --git a/src/wifi/model/qos-txop.cc b/src/wifi/model/qos-txop.cc index d798f0686..9cec4fb39 100644 --- a/src/wifi/model/qos-txop.cc +++ b/src/wifi/model/qos-txop.cc @@ -103,7 +103,6 @@ QosTxop::QosTxop () m_baManager->SetBlockAckType (m_blockAckType); m_baManager->SetBlockDestinationCallback (MakeCallback (&QosBlockedDestinations::Block, m_qosBlockedDestinations)); m_baManager->SetUnblockDestinationCallback (MakeCallback (&QosBlockedDestinations::Unblock, m_qosBlockedDestinations)); - m_baManager->SetMaxPacketDelay (m_queue->GetMaxDelay ()); m_baManager->SetTxOkCallback (MakeCallback (&QosTxop::BaTxOk, this)); m_baManager->SetTxFailedCallback (MakeCallback (&QosTxop::BaTxFailed, this)); }