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

wifi: Remove Holland (solves #278)

Browse Source
This commit is contained in:
Rediet
2021-01-15 17:55:38 +01:00
parent d790fae26f
commit 2aba58e77e
20 changed files with 24 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/wireless/wifi-adhoc.cc
View File

@@ -241,7 +241,6 @@ int main (int argc, char *argv[])
gnuplot.GenerateOutput (std::cout);
gnuplot = Gnuplot ("rate-control.png");
wifi.SetStandard (WIFI_STANDARD_holland);
NS_LOG_DEBUG ("arf");
experiment = Experiment ("arf");

8
examples/wireless/wifi-backward-compatibility.cc
View File

@@ -67,10 +67,6 @@ WifiStandard ConvertStringToStandard (std::string version)
{
standard = WIFI_STANDARD_80211p;
}
else if (version == "holland")
{
standard = WIFI_STANDARD_holland;
}
else if (version == "80211n_2_4GHZ")
{
standard = WIFI_STANDARD_80211n_2_4GHZ;
@@ -107,8 +103,8 @@ int main (int argc, char *argv[])
CommandLine cmd (__FILE__);
cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
cmd.AddValue ("apVersion", "The standard version used by the AP: 80211a, 80211b, 80211g, 80211p, holland, 80211n_2_4GHZ, 80211n_5GHZ, 80211ac, 80211ax_2_4GHZ or 80211ax_5GHZ", apVersion);
cmd.AddValue ("staVersion", "The standard version used by the station: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, holland, 80211n_2_4GHZ, 80211n_5GHZ, 80211ac, 80211ax_2_4GHZ or 80211ax_5GHZ", staVersion);
cmd.AddValue ("apVersion", "The standard version used by the AP: 80211a, 80211b, 80211g, 80211p, 80211n_2_4GHZ, 80211n_5GHZ, 80211ac, 80211ax_2_4GHZ or 80211ax_5GHZ", apVersion);
cmd.AddValue ("staVersion", "The standard version used by the station: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, 80211n_2_4GHZ, 80211n_5GHZ, 80211ac, 80211ax_2_4GHZ or 80211ax_5GHZ", staVersion);
cmd.AddValue ("apRaa", "Rate adaptation algorithm used by the AP", apRaa);
cmd.AddValue ("staRaa", "Rate adaptation algorithm used by the station", staRaa);
cmd.AddValue ("apHasTraffic", "Enable/disable traffic on the AP", apHasTraffic);

2
examples/wireless/wifi-multirate.cc
View File

@@ -601,7 +601,7 @@ int main (int argc, char *argv[])
wifiMac.SetType ("ns3::AdhocWifiMac",
"Ssid", StringValue ("Testbed"));
wifi.SetStandard (WIFI_STANDARD_holland);
wifi.SetStandard (WIFI_STANDARD_80211a);
wifi.SetRemoteStationManager (experiment.GetRateManager ());
NS_LOG_INFO ("Scenario: " << experiment.GetScenario ());