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

wifi: Fix some types in MacLow

Browse Source
This commit is contained in:
Sébastien Deronne
2018-05-11 16:58:49 +02:00
parent ac43c999a2
commit d71a519976
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wifi/model/mac-low.cc
View File

@@ -2301,7 +2301,7 @@ MacLow::DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr,
}
bool
MacLow::StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const
MacLow::StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint8_t blockAckSize) const
{
if (peekedPacket == 0)
{
@@ -2326,7 +2326,7 @@ MacLow::StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peeke
return true;
}
if (!edcaIt->second->GetMpduAggregator ()->CanBeAggregated (peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, aggregatedPacket, size))
if (!edcaIt->second->GetMpduAggregator ()->CanBeAggregated (peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, aggregatedPacket, blockAckSize))
{
NS_LOG_DEBUG ("no more packets can be aggregated because the maximum A-MPDU size has been reached");
return true;
@@ -2379,9 +2379,9 @@ MacLow::AggregateToAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr)
uint16_t startingSequenceNumber = 0;
uint16_t currentSequenceNumber = 0;
uint8_t qosPolicy = 0;
uint16_t blockAckSize = 0;
uint8_t blockAckSize = 0;
bool aggregated = false;
int i = 0;
uint8_t i = 0;
aggPacket = newPacket->Copy ();
if (!hdr.IsBlockAckReq ())
@@ -2669,7 +2669,7 @@ MacLow::InsertInTxQueue (Ptr<const Packet> packet, const WifiMacHeader &hdr, Tim
}
Ptr<Packet>
MacLow::PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint16_t blockAckSize)
MacLow::PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint8_t blockAckSize)
{
bool msduAggregation = false;
bool isAmsdu = false;

6
src/wifi/model/mac-low.h
View File

@@ -388,13 +388,13 @@ public:
* \param peekedPacket the packet to be aggregated
* \param peekedHdr the WifiMacHeader for the packet.
* \param aggregatedPacket the current A-MPDU
* \param size the size of a piggybacked block ack request
* \param blockAckSize the size of a piggybacked block ack request
* \return false if the given packet can be added to an A-MPDU, true otherwise
*
* This function decides if a given packet can be added to an A-MPDU or not
*
*/
bool StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const;
bool StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint8_t blockAckSize) const;
/**
*
* This function is called to flush the aggregate queue, which is used for A-MPDU
@@ -818,7 +818,7 @@ private:
*
* \return the aggregate if MSDU aggregation succeeded, 0 otherwise
*/
Ptr<Packet> PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint16_t blockAckSize);
Ptr<Packet> PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint8_t blockAckSize);
Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)
Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)