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

wifi: Small changes for 11ac/11ax

Browse Source 
(cherry picked from commit 0684a0083da975bbe2965a1380064ef263a870b0)
This commit is contained in:
Sébastien Deronne
2019-02-04 17:30:23 +01:00
parent 5c0b2af65d
commit de7fc0096c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wifi/model/wifi-phy.cc
View File

@@ -1092,11 +1092,15 @@ void
WifiPhy::Configure80211ax (void)
{
NS_LOG_FUNCTION (this);
Configure80211n ();
if (Is5Ghz (GetFrequency ()))
{
Configure80211ac ();
}
else
{
Configure80211n ();
}
m_deviceMcsSet.push_back (WifiPhy::GetHeMcs0 ());
m_deviceMcsSet.push_back (WifiPhy::GetHeMcs1 ());
m_deviceMcsSet.push_back (WifiPhy::GetHeMcs2 ());
@@ -1248,8 +1252,6 @@ WifiPhy::ConfigureStandard (WifiPhyStandard standard)
ConfigureHolland ();
break;
case WIFI_PHY_STANDARD_80211n_2_4GHZ:
Configure80211n ();
break;
case WIFI_PHY_STANDARD_80211n_5GHZ:
Configure80211n ();
break;
@@ -1257,8 +1259,6 @@ WifiPhy::ConfigureStandard (WifiPhyStandard standard)
Configure80211ac ();
break;
case WIFI_PHY_STANDARD_80211ax_2_4GHZ:
Configure80211ax ();
break;
case WIFI_PHY_STANDARD_80211ax_5GHZ:
Configure80211ax ();
break;

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

@@ -1340,7 +1340,7 @@ WifiRemoteStationManager::AddBasicMode (WifiMode mode)
NS_LOG_FUNCTION (this << mode);
if (mode.GetModulationClass () == WIFI_MOD_CLASS_HT || mode.GetModulationClass () == WIFI_MOD_CLASS_VHT || mode.GetModulationClass () == WIFI_MOD_CLASS_HE)
{
NS_FATAL_ERROR ("It is not allowed to add a (V)HT rate in the BSSBasicRateSet!");
NS_FATAL_ERROR ("It is not allowed to add a HT, VHT or HE rate in the BSSBasicRateSet!");
}
for (uint8_t i = 0; i < GetNBasicModes (); i++)
{