wifi: remove functions that are never used

This commit is contained in:
Sébastien Deronne
2017-10-21 10:12:02 +02:00
parent 5fe45ac83e
commit a8701bb9c2
14 changed files with 0 additions and 196 deletions

View File

@@ -183,13 +183,6 @@ ApWifiMac::SetBeaconInterval (Time interval)
m_beaconInterval = interval;
}
void
ApWifiMac::StartBeaconing (void)
{
NS_LOG_FUNCTION (this);
SendOneBeacon ();
}
int64_t
ApWifiMac::AssignStreams (int64_t stream)
{

View File

@@ -100,10 +100,6 @@ public:
* \return the interval between two beacon transmissions.
*/
Time GetBeaconInterval (void) const;
/**
* Start beacon transmission immediately.
*/
void StartBeaconing (void);
/**
* Determine whether short slot time should be enabled or not in the BSS.
* Typically, true is returned only when there is no non-erp stations associated

View File

@@ -841,35 +841,6 @@ BlockAckManager::TearDownBlockAck (Mac48Address recipient, uint8_t tid)
DestroyAgreement (recipient, tid);
}
bool
BlockAckManager::HasOtherFragments (uint16_t sequenceNumber) const
{
NS_LOG_FUNCTION (this << sequenceNumber);
bool retVal = false;
if (m_retryPackets.size () > 0)
{
Item next = *(m_retryPackets.front ());
if (next.hdr.GetSequenceNumber () == sequenceNumber)
{
retVal = true;
}
}
return retVal;
}
uint32_t
BlockAckManager::GetNextPacketSize (void) const
{
NS_LOG_FUNCTION (this);
uint32_t size = 0;
if (m_retryPackets.size () > 0)
{
Item next = *(m_retryPackets.front ());
size = next.packet->GetSize ();
}
return size;
}
bool BlockAckManager::NeedBarRetransmission (uint8_t tid, uint16_t seqNumber, Mac48Address recipient)
{
//The standard says the BAR gets discarded when all MSDUs lifetime expires

View File

@@ -285,22 +285,6 @@ public:
* from recipient. The relative block ack agreement is destroyed.
*/
void TearDownBlockAck (Mac48Address recipient, uint8_t tid);
/**
* \param sequenceNumber Sequence number of the packet which fragment is
* part of.
* \return true if another fragment with the given sequence number is scheduled
* for retransmission.
*
* Returns true if another fragment with sequence number <i>sequenceNumber</i> is scheduled
* for retransmission.
*/
bool HasOtherFragments (uint16_t sequenceNumber) const;
/**
* \return the size of the next packet that needs retransmission
*
* Returns size of the next packet that needs retransmission.
*/
uint32_t GetNextPacketSize (void) const;
/**
* \param maxDelay Max delay for a buffered packet.
*

View File

@@ -353,13 +353,6 @@ DcaTxop::GetFragmentPacket (WifiMacHeader *hdr)
return fragment;
}
bool
DcaTxop::NeedsAccess (void) const
{
NS_LOG_FUNCTION (this);
return !m_queue->IsEmpty () || m_currentPacket != 0;
}
void
DcaTxop::NotifyAccessGranted (void)
{

View File

@@ -300,14 +300,6 @@ protected:
virtual void DoInitialize (void);
/* dcf notifications forwarded here */
/**
* Check if the DCF requires access.
*
* \return true if the DCF requires access,
* false otherwise
*/
virtual bool NeedsAccess (void) const;
/**
* Notify the DCF that access has been granted.
*/

View File

@@ -106,18 +106,6 @@ EdcaTxopN::GetBaAgreementExists (Mac48Address address, uint8_t tid) const
return m_baManager->ExistsAgreement (address, tid);
}
uint32_t
EdcaTxopN::GetNOutstandingPacketsInBa (Mac48Address address, uint8_t tid) const
{
return m_baManager->GetNBufferedPackets (address, tid);
}
uint32_t
EdcaTxopN::GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const
{
return m_baManager->GetNRetryNeededPackets (recipient, tid);
}
void
EdcaTxopN::CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid)
{
@@ -146,13 +134,6 @@ EdcaTxopN::GetTypeOfStation (void) const
return m_typeOfStation;
}
bool
EdcaTxopN::NeedsAccess (void) const
{
NS_LOG_FUNCTION (this);
return !m_queue->IsEmpty () || m_currentPacket != 0 || m_baManager->HasPackets ();
}
uint16_t EdcaTxopN::GetNextSequenceNumberFor (WifiMacHeader *hdr)
{
return m_txMiddle->GetNextSequenceNumberFor (hdr);

View File

@@ -131,24 +131,6 @@ public:
* <i>recipient</i> for tid <i>tid</i>.
*/
bool GetBaAgreementExists (Mac48Address address, uint8_t tid) const;
/**
* \param address recipient address of peer station involved in block ack mechanism.
* \param tid traffic ID.
*
* \return the number of packets buffered for a specified agreement.
*
* Returns number of packets buffered for a specified agreement.
*/
uint32_t GetNOutstandingPacketsInBa (Mac48Address address, uint8_t tid) const;
/**
* \param recipient address of peer station involved in block ack mechanism.
* \param tid traffic ID.
*
* \return the number of packets for a specific agreement that need retransmission.
*
* Returns number of packets for a specific agreement that need retransmission.
*/
uint32_t GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const;
/**
* \param recipient address of peer station involved in block ack mechanism.
* \param tid Ttraffic ID of transmitted packet.
@@ -159,13 +141,6 @@ public:
void CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid);
/* dcf notifications forwarded here */
/**
* Check if the EDCAF requires access.
*
* \return true if the EDCAF requires access,
* false otherwise.
*/
bool NeedsAccess (void) const;
/**
* Notify the EDCAF that access has been granted.
*/

View File

@@ -52,12 +52,6 @@ InterferenceHelper::Event::GetPacket (void) const
return m_packet;
}
Time
InterferenceHelper::Event::GetDuration (void) const
{
return m_endTime - m_startTime;
}
Time
InterferenceHelper::Event::GetStartTime (void) const
{

View File

@@ -57,12 +57,6 @@ public:
* \return the packet
*/
Ptr<const Packet> GetPacket (void) const;
/**
* Return the duration of the signal.
*
* \return the duration of the signal
*/
Time GetDuration (void) const;
/**
* Return the start time of the signal.
*

View File

@@ -1252,12 +1252,6 @@ MacLow::GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr, bool isAmpd
return size;
}
WifiTxVector
MacLow::GetCtsToSelfTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
{
return m_stationManager->GetCtsToSelfTxVector (hdr, packet);
}
WifiTxVector
MacLow::GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
{

View File

@@ -715,16 +715,6 @@ private:
* \return TXVECTOR for the Block ACK
*/
WifiTxVector GetBlockAckTxVector (Mac48Address to, WifiMode dataTxMode) const;
/**
* Return a TXVECTOR for the CTS-to-self frame.
* The function consults WifiRemoteStationManager, which controls the rate
* to different destinations.
*
* \param packet the packet that requires CTS-to-self
* \param hdr the Wifi header of the packet
* \return TXVECTOR for the CTS-to-self operation
*/
WifiTxVector GetCtsToSelfTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
/**
* Return a TXVECTOR for the CTS frame given the destination and the mode of the RTS
* used by the sender.

View File

@@ -105,34 +105,6 @@ StaWifiMac::~StaWifiMac ()
NS_LOG_FUNCTION (this);
}
void
StaWifiMac::SetMaxMissedBeacons (uint32_t missed)
{
NS_LOG_FUNCTION (this << missed);
m_maxMissedBeacons = missed;
}
void
StaWifiMac::SetProbeRequestTimeout (Time timeout)
{
NS_LOG_FUNCTION (this << timeout);
m_probeRequestTimeout = timeout;
}
void
StaWifiMac::SetAssocRequestTimeout (Time timeout)
{
NS_LOG_FUNCTION (this << timeout);
m_assocRequestTimeout = timeout;
}
void
StaWifiMac::StartActiveAssociation (void)
{
NS_LOG_FUNCTION (this);
TryToEnsureAssociated ();
}
void
StaWifiMac::SetActiveProbing (bool enable)
{

View File

@@ -58,31 +58,6 @@ public:
*/
void Enqueue (Ptr<const Packet> packet, Mac48Address to);
/**
* \param missed the number of beacons which must be missed
* before a new association sequence is started.
*/
void SetMaxMissedBeacons (uint32_t missed);
/**
* \param timeout
*
* If no probe response is received within the specified
* timeout, the station sends a new probe request.
*/
void SetProbeRequestTimeout (Time timeout);
/**
* \param timeout
*
* If no association response is received within the specified
* timeout, the station sends a new association request.
*/
void SetAssocRequestTimeout (Time timeout);
/**
* Start an active association sequence immediately.
*/
void StartActiveAssociation (void);
private:
/**