From 18df227b4feaaccbf58c9265a29838acfe840bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Fri, 2 Dec 2016 00:14:21 +0100 Subject: [PATCH] wifi: Remove unused variable m_nTxMpdus in MacLow --- src/wifi/model/mac-low.cc | 7 +++---- src/wifi/model/mac-low.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index c19f41942..c2e951e28 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -363,8 +363,7 @@ MacLow::MacLow () m_promisc (false), m_ampdu (false), m_phyMacLowListener (0), - m_ctsToSelfSupported (false), - m_nTxMpdus (0) + m_ctsToSelfSupported (false) { NS_LOG_FUNCTION (this); m_aggregateQueue = CreateObject (); @@ -1531,7 +1530,6 @@ MacLow::ForwardDown (Ptr packet, const WifiMacHeader* hdr, WifiTxV Ptr dequeuedPacket; WifiMacHeader newHdr; WifiMacTrailer fcs; - m_nTxMpdus = m_aggregateQueue->GetSize (); uint32_t queueSize = m_aggregateQueue->GetSize (); bool vhtSingleMpdu = false; bool last = false; @@ -1680,8 +1678,9 @@ MacLow::BlockAckTimeout (void) MacLowTransmissionListener *listener = m_listener; m_listener = 0; m_ampdu = false; + uint32_t nTxMpdus = m_aggregateQueue->GetSize (); FlushAggregateQueue (); - listener->MissedBlockAck (m_nTxMpdus); + listener->MissedBlockAck (nTxMpdus); } void diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h index 1fc89f8e8..c5f9cdc4b 100644 --- a/src/wifi/model/mac-low.h +++ b/src/wifi/model/mac-low.h @@ -1361,7 +1361,6 @@ private: Ptr m_aggregateQueue; //!< Queue used for MPDU aggregation WifiTxVector m_currentTxVector; //!< TXVECTOR used for the current packet transmission std::vector m_txPackets; //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases. - uint32_t m_nTxMpdus; //!