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

add support to block ack tear down in EdcaTxopN

Browse Source
This commit is contained in:
Mirko Banchi
2010-02-03 20:34:53 +01:00
parent 5925c92f74
commit 61fa810ebf
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/devices/wifi/edca-txop-n.cc
View File

@@ -132,6 +132,13 @@ EdcaTxopN::GetTypeId (void)
MakeUintegerAccessor (&EdcaTxopN::SetBlockAckThreshold,
&EdcaTxopN::GetBlockAckThreshold),
MakeUintegerChecker<uint8_t> (0, 64))
.AddAttribute ("BlockAckInactivityTimeout", "Represents max time (blocks of 1024 micro seconds) allowed for block ack\
inactivity. If this value isn't equal to 0 a timer start after that a\
block ack setup is completed and will be reset every time that a block\
ack frame is received. If this value is 0, block ack inactivity timeout won't be used.",
UintegerValue(0),
MakeUintegerAccessor (&EdcaTxopN::m_blockAckInactivityTimeout),
MakeUintegerChecker<uint16_t> ())
;
return tid;
}
@@ -846,6 +853,14 @@ EdcaTxopN::GotAddBaResponse (const MgtAddBaResponseHeader *respHdr, Mac48Address
RestartAccessIfNeeded ();
}
void
EdcaTxopN::GotDelBaFrame (const MgtDelBaHeader *delBaHdr, Mac48Address recipient)
{
NS_LOG_FUNCTION (this);
MY_DEBUG ("received DELBA frame from="<<recipient);
m_baManager->TearDownBlockAck (recipient, delBaHdr->GetTid ());
}
void
EdcaTxopN::GotBlockAck (const CtrlBAckResponseHeader *blockAck, Mac48Address recipient)
{
@@ -904,7 +919,7 @@ EdcaTxopN::SetupBlockAckIfNeeded ()
{
/* Block ack setup */
uint16_t startingSequence = m_txMiddle->GetNextSeqNumberByTidAndAddress (tid, recipient);
SendAddBaRequest (recipient, tid, startingSequence, 0, true);
SendAddBaRequest (recipient, tid, startingSequence, m_blockAckInactivityTimeout, true);
return true;
}
return false;
@@ -960,6 +975,7 @@ EdcaTxopN::CompleteConfig (void)
NS_LOG_FUNCTION (this);
m_baManager->SetTxMiddle (m_txMiddle);
m_low->RegisterBlockAckListenerForAc (m_ac, m_blockAckListener);
m_baManager->SetBlockAckInactivityCallback (MakeCallback (&EdcaTxopN::SendDelbaFrame, this));
}
void
@@ -1011,7 +1027,6 @@ EdcaTxopN::SendAddBaRequest (Mac48Address dest, uint8_t tid, uint16_t startSeq,
* will choose how many packets it can receive under block ack.
*/
reqHdr.SetBufferSize (0);
/* Also timeout field is not used for now */
reqHdr.SetTimeout (timeout);
reqHdr.SetStartingSequence (startSeq);

3
src/devices/wifi/edca-txop-n.h
View File

@@ -49,6 +49,7 @@ class QosBlockedDestinations;
class MsduAggregator;
class MgtAddBaResponseHeader;
class BlockAckManager;
class MgtDelBaHeader;
/* This queue contains packets for a particular access class.
@@ -118,6 +119,7 @@ public:
void GotBlockAck (const CtrlBAckResponseHeader *blockAck, Mac48Address recipient);
void MissedBlockAck (void);
void GotAddBaResponse (const MgtAddBaResponseHeader *respHdr, Mac48Address recipient);
void GotDelBaFrame (const MgtDelBaHeader *delBaHdr, Mac48Address recipient);
void MissedAck (void);
void StartNext (void);
void Cancel (void);
@@ -217,6 +219,7 @@ private:
uint8_t m_blockAckThreshold;
enum BlockAckType m_blockAckType;
Time m_currentPacketTimestamp;
uint16_t m_blockAckInactivityTimeout;
};
} //namespace ns3

2
src/devices/wifi/qadhoc-wifi-mac.cc
View File

@@ -409,6 +409,8 @@ QadhocWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
else
{
/* We must notify correct queue tear down of agreement */
AccessClass ac = QosUtilsMapTidToAc (delBaHdr.GetTid ());
m_queues[ac]->GotDelBaFrame (&delBaHdr, hdr->GetAddr2 ());
}
}
}

2
src/devices/wifi/qap-wifi-mac.cc
View File

@@ -730,6 +730,8 @@ QapWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
else
{
/* We must notify correct queue tear down of agreement */
AccessClass ac = QosUtilsMapTidToAc (delBaHdr.GetTid ());
m_queues[ac]->GotDelBaFrame (&delBaHdr, hdr->GetAddr2 ());
}
}
}

2
src/devices/wifi/qsta-wifi-mac.cc
View File

@@ -730,6 +730,8 @@ QstaWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
else
{
/* We must notify correct queue tear down of agreement */
AccessClass ac = QosUtilsMapTidToAc (delBaHdr.GetTid ());
m_queues[ac]->GotDelBaFrame (&delBaHdr, hdr->GetAddr2 ());
}
}
}