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

wifi: Small change in get HT/VHT capabilities/operation

Browse Source
This commit is contained in:
Sébastien Deronne
2017-01-02 16:57:20 +01:00
parent 24d8f6ddea
commit c03b956014
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,9 +504,9 @@ ApWifiMac::GetHtOperation (void) const
{
NS_LOG_FUNCTION (this);
HtOperation operation;
operation.SetHtSupported (1);
if (m_htSupported)
{
operation.SetHtSupported (1);
operation.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());
if (m_nonHtStations.empty ())
{
@@ -525,9 +525,9 @@ ApWifiMac::GetVhtOperation (void) const
{
NS_LOG_FUNCTION (this);
VhtOperation operation;
operation.SetVhtSupported (1);
if (m_vhtSupported)
{
operation.SetVhtSupported (1);
uint8_t channelWidth = GetVhtOperationalChannelWidth ();
if (channelWidth == 160)
{

4
src/wifi/model/regular-wifi-mac.cc
View File

@@ -141,9 +141,9 @@ RegularWifiMac::GetHtCapabilities (void) const
{
NS_LOG_FUNCTION (this);
HtCapabilities capabilities;
capabilities.SetHtSupported (1);
if (m_htSupported)
{
capabilities.SetHtSupported (1);
capabilities.SetLdpc (m_phy->GetLdpc ());
capabilities.SetSupportedChannelWidth (m_phy->GetChannelWidth () == 40);
capabilities.SetShortGuardInterval20 (m_phy->GetGuardInterval ());
@@ -181,9 +181,9 @@ RegularWifiMac::GetVhtCapabilities (void) const
{
NS_LOG_FUNCTION (this);
VhtCapabilities capabilities;
capabilities.SetVhtSupported (1);
if (m_vhtSupported)
{
capabilities.SetVhtSupported (1);
if (m_phy->GetChannelWidth () == 160)
{
capabilities.SetSupportedChannelWidthSet (1);