F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Rename CreateAlias() as CreateAliasIfNeeded() for more clarity

Browse Source
This commit is contained in:
Stefano Avallone
2022-12-07 23:07:33 +01:00
committed by Stefano Avallone
parent 4d8afe006d
commit d8fe5becd8
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/model/eht/eht-frame-exchange-manager.cc
View File

@@ -63,7 +63,7 @@ EhtFrameExchangeManager::SetLinkId(uint8_t linkId)
}
Ptr<WifiMpdu>
EhtFrameExchangeManager::CreateAlias(Ptr<WifiMpdu> mpdu) const
EhtFrameExchangeManager::CreateAliasIfNeeded(Ptr<WifiMpdu> mpdu) const
{
NS_LOG_FUNCTION(this << *mpdu);
@@ -72,7 +72,7 @@ EhtFrameExchangeManager::CreateAlias(Ptr<WifiMpdu> mpdu) const
mpdu->GetHeader().GetAddr1().IsGroup() ||
!GetWifiRemoteStationManager()->GetMldAddress(mpdu->GetHeader().GetAddr1()))
{
return HeFrameExchangeManager::CreateAlias(mpdu);
return HeFrameExchangeManager::CreateAliasIfNeeded(mpdu);
}
mpdu = mpdu->CreateAlias(m_linkId);

2
src/wifi/model/eht/eht-frame-exchange-manager.h
View File

@@ -43,7 +43,7 @@ class EhtFrameExchangeManager : public HeFrameExchangeManager
~EhtFrameExchangeManager() override;
void SetLinkId(uint8_t linkId) override;
Ptr<WifiMpdu> CreateAlias(Ptr<WifiMpdu> mpdu) const override;
Ptr<WifiMpdu> CreateAliasIfNeeded(Ptr<WifiMpdu> mpdu) const override;
protected:
void ForwardPsduDown(Ptr<const WifiPsdu> psdu, WifiTxVector& txVector) override;

3
src/wifi/model/ht/ht-frame-exchange-manager.cc
View File

@@ -388,7 +388,8 @@ HtFrameExchangeManager::StartFrameExchange(Ptr<QosTxop> 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);
}

2
src/wifi/model/mpdu-aggregator.cc
View File

@@ -246,7 +246,7 @@ MpduAggregator::GetNextAmpdu(Ptr<WifiMpdu> 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.

9
src/wifi/model/msdu-aggregator.cc
View File

@@ -127,9 +127,10 @@ MsduAggregator::GetNextAmsdu(Ptr<WifiMpdu> 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<const WifiMpdu> msdu = peekedItem->GetOriginal();
@@ -149,7 +150,7 @@ MsduAggregator::GetNextAmsdu(Ptr<WifiMpdu> peekedItem,
}
// Aggregation succeeded
return m_htFem->CreateAlias(amsdu);
return m_htFem->CreateAliasIfNeeded(amsdu);
}
uint8_t

4
src/wifi/model/qos-frame-exchange-manager.cc
View File

@@ -280,7 +280,7 @@ QosFrameExchangeManager::StartFrameExchange(Ptr<QosTxop> 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<QosTxop> edca,
}
Ptr<WifiMpdu>
QosFrameExchangeManager::CreateAlias(Ptr<WifiMpdu> mpdu) const
QosFrameExchangeManager::CreateAliasIfNeeded(Ptr<WifiMpdu> mpdu) const
{
return mpdu;
}

2
src/wifi/model/qos-frame-exchange-manager.h
View File

@@ -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<WifiMpdu> CreateAlias(Ptr<WifiMpdu> mpdu) const;
virtual Ptr<WifiMpdu> CreateAliasIfNeeded(Ptr<WifiMpdu> mpdu) const;
protected:
void DoDispose() override;