From 8a19cbd288566842b76f4c4b134a0405898af417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 2 Jul 2016 11:48:13 +0200 Subject: [PATCH] examples: remove unnecessary wifi settings --- examples/wireless/80211n-mimo.cc | 3 +-- examples/wireless/ht-wifi-network.cc | 3 +-- examples/wireless/mixed-bg-network.cc | 1 - examples/wireless/mixed-wireless.cc | 3 +-- examples/wireless/power-adaptation-distance.cc | 3 +-- examples/wireless/power-adaptation-interference.cc | 4 +--- examples/wireless/rate-adaptation-distance.cc | 5 +---- examples/wireless/simple-ht-hidden-stations.cc | 2 -- examples/wireless/vht-wifi-network.cc | 3 +-- examples/wireless/wifi-aggregation.cc | 10 +--------- examples/wireless/wifi-ap.cc | 3 +-- examples/wireless/wifi-blockack.cc | 1 - examples/wireless/wifi-simple-infra.cc | 3 +-- examples/wireless/wifi-tcp.cc | 3 +-- examples/wireless/wifi-timing-attributes.cc | 3 +-- examples/wireless/wifi-wired-bridging.cc | 3 +-- 16 files changed, 13 insertions(+), 40 deletions(-) diff --git a/examples/wireless/80211n-mimo.cc b/examples/wireless/80211n-mimo.cc index a4c2323bf..9fe961857 100644 --- a/examples/wireless/80211n-mimo.cc +++ b/examples/wireless/80211n-mimo.cc @@ -158,8 +158,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("ns3-80211n"); mac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevice; staDevice = wifi.Install (phy, mac, wifiStaNode); diff --git a/examples/wireless/ht-wifi-network.cc b/examples/wireless/ht-wifi-network.cc index b2bbb7a0b..86001e750 100644 --- a/examples/wireless/ht-wifi-network.cc +++ b/examples/wireless/ht-wifi-network.cc @@ -117,8 +117,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("ns3-80211n"); mac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevice; staDevice = wifi.Install (phy, mac, wifiStaNode); diff --git a/examples/wireless/mixed-bg-network.cc b/examples/wireless/mixed-bg-network.cc index 3ad8bb908..60a41f32b 100644 --- a/examples/wireless/mixed-bg-network.cc +++ b/examples/wireless/mixed-bg-network.cc @@ -102,7 +102,6 @@ Experiment::Run (bool enableProtection, bool enableShortSlotTime, bool enableSho mac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "ShortSlotTimeSupported", BooleanValue (enableShortSlotTime)); // Configure the PLCP preamble type: long or short diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index 81240880e..468a13b14 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -295,8 +295,7 @@ main (int argc, char *argv[]) wifiInfra.SetRemoteStationManager ("ns3::ArfWifiManager"); // setup stas macInfra.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevices = wifiInfra.Install (wifiPhy, macInfra, stas); // setup ap. macInfra.SetType ("ns3::ApWifiMac", diff --git a/examples/wireless/power-adaptation-distance.cc b/examples/wireless/power-adaptation-distance.cc index 2a2fb33cf..4392caf68 100644 --- a/examples/wireless/power-adaptation-distance.cc +++ b/examples/wireless/power-adaptation-distance.cc @@ -362,8 +362,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("AP"); wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0))); //Configure the AP node diff --git a/examples/wireless/power-adaptation-interference.cc b/examples/wireless/power-adaptation-interference.cc index 30fbf91d0..8146e65c1 100644 --- a/examples/wireless/power-adaptation-interference.cc +++ b/examples/wireless/power-adaptation-interference.cc @@ -402,14 +402,12 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("AP0"); wifiMac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "MaxMissedBeacons", UintegerValue (1000)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0))); ssid = Ssid ("AP1"); wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (1))); //Configure the AP nodes diff --git a/examples/wireless/rate-adaptation-distance.cc b/examples/wireless/rate-adaptation-distance.cc index d19dd4f19..75ff87524 100644 --- a/examples/wireless/rate-adaptation-distance.cc +++ b/examples/wireless/rate-adaptation-distance.cc @@ -221,8 +221,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("AP"); wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0))); //Configure the AP node @@ -252,7 +251,6 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("AP"); wifiMac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0))); @@ -276,7 +274,6 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("AP"); wifiMac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize)); wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0))); diff --git a/examples/wireless/simple-ht-hidden-stations.cc b/examples/wireless/simple-ht-hidden-stations.cc index 7018648d2..6c7eb9692 100644 --- a/examples/wireless/simple-ht-hidden-stations.cc +++ b/examples/wireless/simple-ht-hidden-stations.cc @@ -99,7 +99,6 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("simple-mpdu-aggregation"); mac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (maxAmpduSize)); NetDeviceContainer staDevices; @@ -107,7 +106,6 @@ int main (int argc, char *argv[]) mac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid), - "BeaconInterval", TimeValue (MicroSeconds (102400)), "BeaconGeneration", BooleanValue (true), "BE_MaxAmpduSize", UintegerValue (maxAmpduSize)); diff --git a/examples/wireless/vht-wifi-network.cc b/examples/wireless/vht-wifi-network.cc index 8bda771ff..c88defef5 100644 --- a/examples/wireless/vht-wifi-network.cc +++ b/examples/wireless/vht-wifi-network.cc @@ -106,8 +106,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("ns3-80211ac"); mac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevice; staDevice = wifi.Install (phy, mac, wifiStaNode); diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc index dfcf2d571..5e22fe5ce 100644 --- a/examples/wireless/wifi-aggregation.cc +++ b/examples/wireless/wifi-aggregation.cc @@ -100,13 +100,11 @@ int main (int argc, char *argv[]) ssid = Ssid ("network-A"); phy.Set ("ChannelNumber", UintegerValue(36)); mac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); staDeviceA = wifi.Install (phy, mac, wifiStaNode.Get(0)); mac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid), - "BeaconInterval", TimeValue (MicroSeconds (102400)), "BeaconGeneration", BooleanValue (true)); apDeviceA = wifi.Install (phy, mac, wifiApNode.Get(0)); @@ -115,14 +113,12 @@ int main (int argc, char *argv[]) phy.Set ("ChannelNumber", UintegerValue(40)); mac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (0)); //Disable A-MPDU staDeviceB = wifi.Install (phy, mac, wifiStaNode.Get(1)); mac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid), - "BeaconInterval", TimeValue (MicroSeconds (102400)), "BeaconGeneration", BooleanValue (true)); apDeviceB = wifi.Install (phy, mac, wifiApNode.Get(1)); @@ -131,7 +127,6 @@ int main (int argc, char *argv[]) phy.Set ("ChannelNumber", UintegerValue(44)); mac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (0), //Disable A-MPDU "BE_MaxAmsduSize", UintegerValue (7935)); //Enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes) @@ -139,7 +134,6 @@ int main (int argc, char *argv[]) mac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid), - "BeaconInterval", TimeValue (MicroSeconds (102400)), "BeaconGeneration", BooleanValue (true)); apDeviceC = wifi.Install (phy, mac, wifiApNode.Get(2)); @@ -148,7 +142,6 @@ int main (int argc, char *argv[]) phy.Set ("ChannelNumber", UintegerValue(48)); mac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), "BE_MaxAmpduSize", UintegerValue (32768), //Enable A-MPDU with a smaller size than the default one "BE_MaxAmsduSize", UintegerValue (3839)); //Enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes) @@ -156,7 +149,6 @@ int main (int argc, char *argv[]) mac.SetType ("ns3::ApWifiMac", "Ssid", SsidValue (ssid), - "BeaconInterval", TimeValue (MicroSeconds (102400)), "BeaconGeneration", BooleanValue (true)); apDeviceD = wifi.Install (phy, mac, wifiApNode.Get(3)); diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index 2454cd670..e825c0968 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -150,8 +150,7 @@ int main (int argc, char *argv[]) wifi.SetRemoteStationManager ("ns3::ArfWifiManager"); // setup stas. wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); staDevs = wifi.Install (wifiPhy, wifiMac, stas); // setup ap. wifiMac.SetType ("ns3::ApWifiMac", diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 0028342b1..5807d9a6f 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -72,7 +72,6 @@ int main (int argc, char const* argv[]) mac.SetType ("ns3::StaWifiMac", "QosSupported", BooleanValue (true), "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false), /* setting blockack threshold for sta's BE queue */ "BE_BlockAckThreshold", UintegerValue (2), /* setting block inactivity timeout to 3*1024 = 3072 microseconds */ diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index c5ed3593c..96be6b0f0 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -157,8 +157,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("wifi-default"); // setup sta. wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevice = wifi.Install (wifiPhy, wifiMac, c.Get (0)); NetDeviceContainer devices = staDevice; // setup ap. diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc index 92bfb3219..0db944829 100644 --- a/examples/wireless/wifi-tcp.cc +++ b/examples/wireless/wifi-tcp.cc @@ -124,8 +124,7 @@ main(int argc, char *argv[]) /* Configure STA */ wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevices; staDevices = wifiHelper.Install (wifiPhy, wifiMac, staWifiNode); diff --git a/examples/wireless/wifi-timing-attributes.cc b/examples/wireless/wifi-timing-attributes.cc index 2388c1e38..964e8c028 100644 --- a/examples/wireless/wifi-timing-attributes.cc +++ b/examples/wireless/wifi-timing-attributes.cc @@ -92,8 +92,7 @@ int main (int argc, char *argv[]) //Install PHY and MAC Ssid ssid = Ssid ("ns3-wifi"); mac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); NetDeviceContainer staDevice; staDevice = wifi.Install (phy, mac, wifiStaNode); diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index 14dc67f66..98b2b2ee7 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -147,8 +147,7 @@ int main (int argc, char *argv[]) "Bounds", RectangleValue (Rectangle (wifiX, wifiX+5.0,0.0, (nStas+1)*5.0))); mobility.Install (sta); wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); + "Ssid", SsidValue (ssid)); staDev = wifi.Install (wifiPhy, wifiMac, sta); staInterface = ip.Assign (staDev);