From d8fe5becd8b1abe68f3fe4e40d7ff6cc0d20d289 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 7 Dec 2022 23:07:33 +0100 Subject: [PATCH] wifi: Rename CreateAlias() as CreateAliasIfNeeded() for more clarity --- src/wifi/model/eht/eht-frame-exchange-manager.cc | 4 ++-- src/wifi/model/eht/eht-frame-exchange-manager.h | 2 +- src/wifi/model/ht/ht-frame-exchange-manager.cc | 3 ++- src/wifi/model/mpdu-aggregator.cc | 2 +- src/wifi/model/msdu-aggregator.cc | 9 +++++---- src/wifi/model/qos-frame-exchange-manager.cc | 4 ++-- src/wifi/model/qos-frame-exchange-manager.h | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/wifi/model/eht/eht-frame-exchange-manager.cc b/src/wifi/model/eht/eht-frame-exchange-manager.cc index e19dbb9fc..7fb088945 100644 --- a/src/wifi/model/eht/eht-frame-exchange-manager.cc +++ b/src/wifi/model/eht/eht-frame-exchange-manager.cc @@ -63,7 +63,7 @@ EhtFrameExchangeManager::SetLinkId(uint8_t linkId) } Ptr -EhtFrameExchangeManager::CreateAlias(Ptr mpdu) const +EhtFrameExchangeManager::CreateAliasIfNeeded(Ptr mpdu) const { NS_LOG_FUNCTION(this << *mpdu); @@ -72,7 +72,7 @@ EhtFrameExchangeManager::CreateAlias(Ptr mpdu) const mpdu->GetHeader().GetAddr1().IsGroup() || !GetWifiRemoteStationManager()->GetMldAddress(mpdu->GetHeader().GetAddr1())) { - return HeFrameExchangeManager::CreateAlias(mpdu); + return HeFrameExchangeManager::CreateAliasIfNeeded(mpdu); } mpdu = mpdu->CreateAlias(m_linkId); diff --git a/src/wifi/model/eht/eht-frame-exchange-manager.h b/src/wifi/model/eht/eht-frame-exchange-manager.h index 5deb64310..ed7c360a9 100644 --- a/src/wifi/model/eht/eht-frame-exchange-manager.h +++ b/src/wifi/model/eht/eht-frame-exchange-manager.h @@ -43,7 +43,7 @@ class EhtFrameExchangeManager : public HeFrameExchangeManager ~EhtFrameExchangeManager() override; void SetLinkId(uint8_t linkId) override; - Ptr CreateAlias(Ptr mpdu) const override; + Ptr CreateAliasIfNeeded(Ptr mpdu) const override; protected: void ForwardPsduDown(Ptr psdu, WifiTxVector& txVector) override; diff --git a/src/wifi/model/ht/ht-frame-exchange-manager.cc b/src/wifi/model/ht/ht-frame-exchange-manager.cc index 3fc980772..80839de1b 100644 --- a/src/wifi/model/ht/ht-frame-exchange-manager.cc +++ b/src/wifi/model/ht/ht-frame-exchange-manager.cc @@ -388,7 +388,8 @@ HtFrameExchangeManager::StartFrameExchange(Ptr edca, Time availableTime // Use SendDataFrame if we can try aggregation if (hdr.IsQosData() && !hdr.GetAddr1().IsGroup() && !peekedItem->IsFragment() && - !GetWifiRemoteStationManager()->NeedFragmentation(peekedItem = CreateAlias(peekedItem))) + !GetWifiRemoteStationManager()->NeedFragmentation(peekedItem = + CreateAliasIfNeeded(peekedItem))) { return SendDataFrame(peekedItem, availableTime, initialFrame); } diff --git a/src/wifi/model/mpdu-aggregator.cc b/src/wifi/model/mpdu-aggregator.cc index 09918ce84..7b5d5cf16 100644 --- a/src/wifi/model/mpdu-aggregator.cc +++ b/src/wifi/model/mpdu-aggregator.cc @@ -246,7 +246,7 @@ MpduAggregator::GetNextAmpdu(Ptr mpdu, qosTxop->GetBaStartingSequence(origRecipient, tid), qosTxop->GetBaBufferSize(origRecipient, tid))); - peekedMpdu = m_htFem->CreateAlias(peekedMpdu); + peekedMpdu = m_htFem->CreateAliasIfNeeded(peekedMpdu); // get the next MPDU to aggregate, provided that the constraints on size // and duration limit are met. Note that the returned MPDU differs from // the peeked MPDU if A-MSDU aggregation is enabled. diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index 1b9cb6dc4..a6cf490aa 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -127,9 +127,10 @@ MsduAggregator::GetNextAmsdu(Ptr peekedItem, uint8_t nMsdu = 1; peekedItem = queue->PeekByTidAndAddress(tid, recipient, peekedItem->GetOriginal()); - while (peekedItem && m_htFem->TryAggregateMsdu(peekedItem = m_htFem->CreateAlias(peekedItem), - txParams, - availableTime)) + while (peekedItem && + m_htFem->TryAggregateMsdu(peekedItem = m_htFem->CreateAliasIfNeeded(peekedItem), + txParams, + availableTime)) { // find the next MPDU before dequeuing the current one Ptr msdu = peekedItem->GetOriginal(); @@ -149,7 +150,7 @@ MsduAggregator::GetNextAmsdu(Ptr peekedItem, } // Aggregation succeeded - return m_htFem->CreateAlias(amsdu); + return m_htFem->CreateAliasIfNeeded(amsdu); } uint8_t diff --git a/src/wifi/model/qos-frame-exchange-manager.cc b/src/wifi/model/qos-frame-exchange-manager.cc index e80287dc8..34766713e 100644 --- a/src/wifi/model/qos-frame-exchange-manager.cc +++ b/src/wifi/model/qos-frame-exchange-manager.cc @@ -280,7 +280,7 @@ QosFrameExchangeManager::StartFrameExchange(Ptr edca, return false; } - mpdu = CreateAlias(mpdu); + mpdu = CreateAliasIfNeeded(mpdu); WifiTxParameters txParams; txParams.m_txVector = GetWifiRemoteStationManager()->GetDataTxVector(mpdu->GetHeader(), m_allowedWidth); @@ -314,7 +314,7 @@ QosFrameExchangeManager::StartFrameExchange(Ptr edca, } Ptr -QosFrameExchangeManager::CreateAlias(Ptr mpdu) const +QosFrameExchangeManager::CreateAliasIfNeeded(Ptr mpdu) const { return mpdu; } diff --git a/src/wifi/model/qos-frame-exchange-manager.h b/src/wifi/model/qos-frame-exchange-manager.h index c6056d1e6..4e02c281f 100644 --- a/src/wifi/model/qos-frame-exchange-manager.h +++ b/src/wifi/model/qos-frame-exchange-manager.h @@ -100,7 +100,7 @@ class QosFrameExchangeManager : public FrameExchangeManager * \param mpdu the given MPDU * \return the alias of the given MPDU for transmission on this link */ - virtual Ptr CreateAlias(Ptr mpdu) const; + virtual Ptr CreateAliasIfNeeded(Ptr mpdu) const; protected: void DoDispose() override;