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

wifi: Cleanup unused address field in WifiRemoteStationManager::GetControlAnswerMode

Browse Source
This commit is contained in:
Sébastien Deronne
2018-09-22 13:56:54 +02:00
parent 1e922186d1
commit 29dcbd175f
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/wifi/model/wifi-remote-station-manager.cc
View File

@@ -818,12 +818,8 @@ WifiRemoteStationManager::GetDataTxVector (Mac48Address address, const WifiMacHe
if (!IsLowLatency ())
{
HighLatencyDataTxVectorTag datatag;
bool found;
found = ConstCast<Packet> (packet)->PeekPacketTag (datatag);
bool found = ConstCast<Packet> (packet)->PeekPacketTag (datatag);
NS_ASSERT (found);
//cast found to void, to suppress 'found' set but not used
//compiler warning
(void) found;
return datatag.GetDataTxVector ();
}
WifiTxVector txVector = DoGetDataTxVector (Lookup (address, header));
@@ -855,12 +851,8 @@ WifiRemoteStationManager::GetCtsToSelfTxVector (const WifiMacHeader *header,
if (!IsLowLatency ())
{
HighLatencyCtsToSelfTxVectorTag ctstoselftag;
bool found;
found = ConstCast<Packet> (packet)->PeekPacketTag (ctstoselftag);
bool found = ConstCast<Packet> (packet)->PeekPacketTag (ctstoselftag);
NS_ASSERT (found);
//cast found to void, to suppress 'found' set but not used
//compiler warning
(void) found;
return ctstoselftag.GetCtsToSelfTxVector ();
}
return DoGetCtsToSelfTxVector ();
@@ -909,12 +901,8 @@ WifiRemoteStationManager::GetRtsTxVector (Mac48Address address, const WifiMacHea
if (!IsLowLatency ())
{
HighLatencyRtsTxVectorTag rtstag;
bool found;
found = ConstCast<Packet> (packet)->PeekPacketTag (rtstag);
bool found = ConstCast<Packet> (packet)->PeekPacketTag (rtstag);
NS_ASSERT (found);
//cast found to void, to suppress 'found' set but not used
//compiler warning
(void) found;
return rtstag.GetRtsTxVector ();
}
return DoGetRtsTxVector (Lookup (address, header));
@@ -1343,7 +1331,7 @@ WifiRemoteStationManager::IsAllowedControlAnswerModulationClass (WifiModulationC
}
WifiMode
WifiRemoteStationManager::GetControlAnswerMode (Mac48Address address, WifiMode reqMode)
WifiRemoteStationManager::GetControlAnswerMode (WifiMode reqMode)
{
/**
* The standard has relatively unambiguous rules for selecting a
@@ -1359,7 +1347,7 @@ WifiRemoteStationManager::GetControlAnswerMode (Mac48Address address, WifiMode r
* sequence (as defined in Annex G) and that is of the same
* modulation class (see Section 9.7.8) as the received frame...
*/
NS_LOG_FUNCTION (this << address << reqMode);
NS_LOG_FUNCTION (this << reqMode);
WifiMode mode = GetDefaultMode ();
bool found = false;
//First, search the BSS Basic Rate set
@@ -1487,7 +1475,7 @@ WifiTxVector
WifiRemoteStationManager::GetCtsTxVector (Mac48Address address, WifiMode rtsMode)
{
NS_ASSERT (!address.IsGroup ());
WifiMode ctsMode = GetControlAnswerMode (address, rtsMode);
WifiMode ctsMode = GetControlAnswerMode (rtsMode);
WifiTxVector v;
v.SetMode (ctsMode);
v.SetPreambleType (GetPreambleForTransmission (ctsMode, address));
@@ -1504,7 +1492,7 @@ WifiTxVector
WifiRemoteStationManager::GetAckTxVector (Mac48Address address, WifiMode dataMode)
{
NS_ASSERT (!address.IsGroup ());
WifiMode ackMode = GetControlAnswerMode (address, dataMode);
WifiMode ackMode = GetControlAnswerMode (dataMode);
WifiTxVector v;
v.SetMode (ackMode);
v.SetPreambleType (GetPreambleForTransmission (ackMode, address));
@@ -1521,7 +1509,7 @@ WifiTxVector
WifiRemoteStationManager::GetBlockAckTxVector (Mac48Address address, WifiMode blockAckReqMode)
{
NS_ASSERT (!address.IsGroup ());
WifiMode blockAckMode = GetControlAnswerMode (address, blockAckReqMode);
WifiMode blockAckMode = GetControlAnswerMode (blockAckReqMode);
WifiTxVector v;
v.SetMode (blockAckMode);
v.SetPreambleType (GetPreambleForTransmission (blockAckMode, address));

3
src/wifi/model/wifi-remote-station-manager.h
View File

@@ -1365,12 +1365,11 @@ private:
/**
* Get control answer mode function.
*
* \param address the address of the station
* \param reqMode request mode
*
* \return control answer mode
*/
WifiMode GetControlAnswerMode (Mac48Address address, WifiMode reqMode);
WifiMode GetControlAnswerMode (WifiMode reqMode);
/**
* Actually sets the fragmentation threshold, it also checks the validity of