From 84c4f7f2fef579d384c5e3d7e863de5461df56f5 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 24 Aug 2022 16:09:34 +0200 Subject: [PATCH] wifi: FEM::ReceiveMpdu() can receive pointers to const WifiMpdu --- src/wifi/model/frame-exchange-manager.cc | 2 +- src/wifi/model/frame-exchange-manager.h | 2 +- src/wifi/model/he/he-frame-exchange-manager.cc | 2 +- src/wifi/model/he/he-frame-exchange-manager.h | 2 +- src/wifi/model/ht/ht-frame-exchange-manager.cc | 2 +- src/wifi/model/ht/ht-frame-exchange-manager.h | 2 +- src/wifi/model/qos-frame-exchange-manager.cc | 2 +- src/wifi/model/qos-frame-exchange-manager.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wifi/model/frame-exchange-manager.cc b/src/wifi/model/frame-exchange-manager.cc index 6bdcde825..20c432816 100644 --- a/src/wifi/model/frame-exchange-manager.cc +++ b/src/wifi/model/frame-exchange-manager.cc @@ -1094,7 +1094,7 @@ FrameExchangeManager::NavResetTimeout (void) } void -FrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, +FrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) { NS_LOG_FUNCTION (this << *mpdu << rxSignalInfo << txVector << inAmpdu); diff --git a/src/wifi/model/frame-exchange-manager.h b/src/wifi/model/frame-exchange-manager.h index 2cec938f4..b7151132f 100644 --- a/src/wifi/model/frame-exchange-manager.h +++ b/src/wifi/model/frame-exchange-manager.h @@ -311,7 +311,7 @@ protected: * \param txVector TxVector of the received PSDU * \param inAmpdu true if the MPDU is part of an A-MPDU */ - virtual void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, + virtual void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu); /** diff --git a/src/wifi/model/he/he-frame-exchange-manager.cc b/src/wifi/model/he/he-frame-exchange-manager.cc index aabb2e520..3778f9f46 100644 --- a/src/wifi/model/he/he-frame-exchange-manager.cc +++ b/src/wifi/model/he/he-frame-exchange-manager.cc @@ -1439,7 +1439,7 @@ HeFrameExchangeManager::SetTxopHolder (Ptr psdu, const WifiTxVec } void -HeFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, +HeFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) { // The received MPDU is either broadcast or addressed to this station diff --git a/src/wifi/model/he/he-frame-exchange-manager.h b/src/wifi/model/he/he-frame-exchange-manager.h index 164897a7d..2e20e4570 100644 --- a/src/wifi/model/he/he-frame-exchange-manager.h +++ b/src/wifi/model/he/he-frame-exchange-manager.h @@ -94,7 +94,7 @@ public: protected: void DoDispose () override; - void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, + void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) override; void EndReceiveAmpdu (Ptr psdu, const RxSignalInfo& rxSignalInfo, const WifiTxVector& txVector, const std::vector& perMpduStatus) override; diff --git a/src/wifi/model/ht/ht-frame-exchange-manager.cc b/src/wifi/model/ht/ht-frame-exchange-manager.cc index 919de14e9..ebd838066 100644 --- a/src/wifi/model/ht/ht-frame-exchange-manager.cc +++ b/src/wifi/model/ht/ht-frame-exchange-manager.cc @@ -1310,7 +1310,7 @@ HtFrameExchangeManager::GetBlockAckType (Mac48Address originator, uint8_t tid) c } void -HtFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, +HtFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) { // The received MPDU is either broadcast or addressed to this station diff --git a/src/wifi/model/ht/ht-frame-exchange-manager.h b/src/wifi/model/ht/ht-frame-exchange-manager.h index a1eb2ef8a..d47e3cf7b 100644 --- a/src/wifi/model/ht/ht-frame-exchange-manager.h +++ b/src/wifi/model/ht/ht-frame-exchange-manager.h @@ -211,7 +211,7 @@ public: protected: void DoDispose () override; - void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, + void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) override; void EndReceiveAmpdu (Ptr psdu, const RxSignalInfo& rxSignalInfo, const WifiTxVector& txVector, const std::vector& perMpduStatus) override; diff --git a/src/wifi/model/qos-frame-exchange-manager.cc b/src/wifi/model/qos-frame-exchange-manager.cc index 99ae35cc5..5ab105a9c 100644 --- a/src/wifi/model/qos-frame-exchange-manager.cc +++ b/src/wifi/model/qos-frame-exchange-manager.cc @@ -658,7 +658,7 @@ QosFrameExchangeManager::SetTxopHolder (Ptr psdu, const WifiTxVe } void -QosFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, +QosFrameExchangeManager::ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) { // The received MPDU is either broadcast or addressed to this station diff --git a/src/wifi/model/qos-frame-exchange-manager.h b/src/wifi/model/qos-frame-exchange-manager.h index e6a923200..fd14407bd 100644 --- a/src/wifi/model/qos-frame-exchange-manager.h +++ b/src/wifi/model/qos-frame-exchange-manager.h @@ -93,7 +93,7 @@ public: protected: void DoDispose () override; - void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, + void ReceiveMpdu (Ptr mpdu, RxSignalInfo rxSignalInfo, const WifiTxVector& txVector, bool inAmpdu) override; void PreProcessFrame (Ptr psdu, const WifiTxVector& txVector) override; Time GetFrameDurationId (const WifiMacHeader& header, uint32_t size,