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

wifi: Guard intervals in nanoseconds in Minstrel HT

Browse Source
This commit is contained in:
Sébastien Deronne
2017-01-30 19:49:47 +01:00
parent c353e09c0b
commit c2a286b863
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/model/minstrel-ht-wifi-manager.cc
View File

@@ -923,14 +923,14 @@ MinstrelHtWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
" Station capabilities: (" << GetNumberOfSupportedStreams (station) << "," << GetShortGuardInterval (station) << "," << GetChannelWidth (station) << ")");
}
uint64_t dataRate = GetMcsSupported (station, mcsIndex).GetDataRate (group.chWidth, group.sgi, group.streams);
uint64_t dataRate = GetMcsSupported (station, mcsIndex).GetDataRate (group.chWidth, group.sgi ? 400 : 800, group.streams);
if (!station->m_isSampling)
{
m_rateChange (dataRate, station->m_state->m_address);
}
WifiMode mode = GetMcsSupported (station, mcsIndex);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station),
GetPreambleForTransmission (mode, GetAddress (station)), group.sgi, GetNumberOfAntennas (), group.streams, GetNess (station), group.chWidth, GetAggregation (station) && !station->m_isSampling, GetStbc (station));
GetPreambleForTransmission (mode, GetAddress (station)), group.sgi ? 400 : 800, GetNumberOfAntennas (), group.streams, GetNess (station), group.chWidth, GetAggregation (station) && !station->m_isSampling, GetStbc (station));
}
}
@@ -1006,7 +1006,7 @@ MinstrelHtWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
NS_ASSERT (rateFound);
return WifiTxVector (rtsRate, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (rtsRate, GetAddress (station)),
false, 1, 1, 0, GetChannelWidth (station), GetAggregation (station), false);
800, 1, 1, 0, GetChannelWidth (station), GetAggregation (station), false);
}
}