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

wifi: Remove unused functions

Browse Source
This commit is contained in:
Stefano Avallone
2024-05-03 18:23:19 +02:00
committed by Stefano Avallone
parent 3652a2ef51
commit b31caee0e3
7 changed files with 16 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesh/model/mesh-wifi-interface-mac.cc
View File

@@ -282,11 +282,11 @@ MeshWifiInterfaceMac::SendManagementFrame(Ptr<Packet> packet, const WifiMacHeade
*/
if (hdr.GetAddr1() != Mac48Address::GetBroadcast())
{
GetQosTxop(AC_VO)->Queue(packet, header);
GetQosTxop(AC_VO)->Queue(Create<WifiMpdu>(packet, header));
}
else
{
GetQosTxop(AC_BK)->Queue(packet, header);
GetQosTxop(AC_BK)->Queue(Create<WifiMpdu>(packet, header));
}
}
@@ -405,7 +405,8 @@ MeshWifiInterfaceMac::SendBeacon()
{
(*i)->UpdateBeacon(beacon);
}
m_txop->Queue(beacon.CreatePacket(), beacon.CreateHeader(GetAddress(), GetMeshPointAddress()));
m_txop->Queue(Create<WifiMpdu>(beacon.CreatePacket(),
beacon.CreateHeader(GetAddress(), GetMeshPointAddress())));
ScheduleNextBeacon();
}

14
src/wifi/model/ap-wifi-mac.cc
View File

@@ -1119,7 +1119,7 @@ ApWifiMac::SendProbeResp(Mac48Address to, uint8_t linkId)
if (!GetQosSupported())
{
GetTxop()->Queue(packet, hdr);
GetTxop()->Queue(Create<WifiMpdu>(packet, hdr));
}
// "A QoS STA that transmits a Management frame determines access category used
// for medium access in transmission of the Management frame as follows
@@ -1130,11 +1130,11 @@ ApWifiMac::SendProbeResp(Mac48Address to, uint8_t linkId)
// shall be selected." (Sec. 10.2.3.2 of 802.11-2020)
else if (!GetWifiRemoteStationManager(linkId)->GetQosSupported(to))
{
GetBEQueue()->Queue(packet, hdr);
GetBEQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
else
{
GetVOQueue()->Queue(packet, hdr);
GetVOQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
}
@@ -1408,7 +1408,7 @@ ApWifiMac::SendAssocResp(Mac48Address to, bool isReassoc, uint8_t linkId)
if (!GetQosSupported())
{
GetTxop()->Queue(packet, hdr);
GetTxop()->Queue(Create<WifiMpdu>(packet, hdr));
}
// "A QoS STA that transmits a Management frame determines access category used
// for medium access in transmission of the Management frame as follows
@@ -1419,11 +1419,11 @@ ApWifiMac::SendAssocResp(Mac48Address to, bool isReassoc, uint8_t linkId)
// shall be selected." (Sec. 10.2.3.2 of 802.11-2020)
else if (!GetWifiRemoteStationManager(linkId)->GetQosSupported(to))
{
GetBEQueue()->Queue(packet, hdr);
GetBEQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
else
{
GetVOQueue()->Queue(packet, hdr);
GetVOQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
}
@@ -1518,7 +1518,7 @@ ApWifiMac::SendOneBeacon(uint8_t linkId)
NS_LOG_INFO("Generating beacon from " << link.feManager->GetAddress() << " linkID " << +linkId);
// The beacon has it's own special queue, so we load it in there
m_beaconTxop->Queue(packet, hdr);
m_beaconTxop->Queue(Create<WifiMpdu>(packet, hdr));
link.beaconEvent =
Simulator::Schedule(GetBeaconInterval(), &ApWifiMac::SendOneBeacon, this, linkId);

15
src/wifi/model/qos-utils.cc
View File

@@ -152,21 +152,6 @@ QosUtilsMapTidToAc(uint8_t tid)
return AC_UNDEF;
}
uint8_t
QosUtilsGetTidForPacket(Ptr<const Packet> packet)
{
SocketPriorityTag qos;
uint8_t tid = 8;
if (packet->PeekPacketTag(qos))
{
if (qos.GetPriority() < 8)
{
tid = qos.GetPriority();
}
}
return tid;
}
uint32_t
QosUtilsMapSeqControlToUniqueInteger(uint16_t seqControl, uint16_t endSequence)
{

12
src/wifi/model/qos-utils.h
View File

@@ -218,18 +218,6 @@ extern const std::map<AcIndex, WifiAc> wifiAcList;
*/
AcIndex QosUtilsMapTidToAc(uint8_t tid);
/**
* \ingroup wifi
* If a QoS tag is attached to the packet, returns a value < 8.
* A value >= 8 is returned otherwise.
*
* \param packet the packet to checked for a QoS tag
*
* \return a value less than 8 if QoS tag was present, a value >= 8
* is returned if no QoS tag was present
*/
uint8_t QosUtilsGetTidForPacket(Ptr<const Packet> packet);
/**
* \ingroup wifi
* Next function is useful to correctly sort buffered packets under block ack.

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

@@ -396,7 +396,7 @@ StaWifiMac::SendProbeRequest(uint8_t linkId)
if (!GetQosSupported())
{
GetTxop()->Queue(packet, hdr);
GetTxop()->Queue(Create<WifiMpdu>(packet, hdr));
}
// "A QoS STA that transmits a Management frame determines access category used
// for medium access in transmission of the Management frame as follows
@@ -407,7 +407,7 @@ StaWifiMac::SendProbeRequest(uint8_t linkId)
// shall be selected." (Sec. 10.2.3.2 of 802.11-2020)
else
{
GetVOQueue()->Queue(packet, hdr);
GetVOQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
}
@@ -684,7 +684,7 @@ StaWifiMac::SendAssociationRequest(bool isReassoc)
if (!GetQosSupported())
{
GetTxop()->Queue(packet, hdr);
GetTxop()->Queue(Create<WifiMpdu>(packet, hdr));
}
// "A QoS STA that transmits a Management frame determines access category used
// for medium access in transmission of the Management frame as follows
@@ -695,11 +695,11 @@ StaWifiMac::SendAssociationRequest(bool isReassoc)
// shall be selected." (Sec. 10.2.3.2 of 802.11-2020)
else if (!GetWifiRemoteStationManager(linkId)->GetQosSupported(*link.bssid))
{
GetBEQueue()->Queue(packet, hdr);
GetBEQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
else
{
GetVOQueue()->Queue(packet, hdr);
GetVOQueue()->Queue(Create<WifiMpdu>(packet, hdr));
}
if (m_assocRequestEvent.IsPending())

10
src/wifi/model/txop.cc
View File

@@ -619,16 +619,6 @@ Txop::HasFramesToTransmit(uint8_t linkId)
return ret;
}
void
Txop::Queue(Ptr<Packet> packet, const WifiMacHeader& hdr)
{
NS_LOG_FUNCTION(this << packet << &hdr);
// remove the priority tag attached, if any
SocketPriorityTag priorityTag;
packet->RemovePacketTag(priorityTag);
Queue(Create<WifiMpdu>(packet, hdr));
}
void
Txop::Queue(Ptr<WifiMpdu> mpdu)
{

8
src/wifi/model/txop.h
View File

@@ -353,14 +353,6 @@ class Txop : public Object
virtual void NotifyOn();
/* Event handlers */
/**
* \param packet packet to send.
* \param hdr header of packet to send.
*
* Store the packet in the internal queue until it
* can be sent safely.
*/
virtual void Queue(Ptr<Packet> packet, const WifiMacHeader& hdr);
/**
* \param mpdu the given MPDU
*