diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index ffd085b0d..9cce2fe5b 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -588,10 +588,6 @@ int main (int argc, char *argv[]) //for commandline input experiment.CommandSetup (argc, argv); - // set value to 0 for enabling fragmentation - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue (experiment.GetRtsThreshold ())); - std::ofstream outfile ((experiment.GetOutputFileName () + ".plt").c_str ()); MobilityHelper mobility; diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index 9b3072911..20b12032c 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -167,10 +167,6 @@ Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy, int main (int argc, char *argv[]) { - // disable fragmentation - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); - CommandLine cmd; cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index 56fd28a07..f044bfcc1 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -121,11 +121,6 @@ int main (int argc, char *argv[]) Packet::EnablePrinting (); - // enable rts cts all the time. - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0")); - // disable fragmentation - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - WifiHelper wifi; MobilityHelper mobility; NodeContainer stas; diff --git a/examples/wireless/wifi-ap.py b/examples/wireless/wifi-ap.py index 3d78887be..d21df05dd 100644 --- a/examples/wireless/wifi-ap.py +++ b/examples/wireless/wifi-ap.py @@ -99,11 +99,6 @@ def main(argv): ns.network.Packet.EnablePrinting(); - # enable rts cts all the time. - ns.core.Config.SetDefault("ns3::WifiRemoteStationManager::RtsCtsThreshold", ns.core.StringValue("0")) - # disable fragmentation - ns.core.Config.SetDefault("ns3::WifiRemoteStationManager::FragmentationThreshold", ns.core.StringValue("2200")) - wifi = ns.wifi.WifiHelper() mobility = ns.mobility.MobilityHelper() stas = ns.network.NodeContainer() diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index 5b31dd38f..a44c24bfa 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -174,9 +174,6 @@ int main (int argc, char *argv[]) modes.push_back ("DsssRate2Mbps"); modes.push_back ("DsssRate5_5Mbps"); modes.push_back ("DsssRate11Mbps"); - // disable fragmentation - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); CommandLine cmd; cmd.Parse (argc, argv); diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 75e1236e8..dd11d110f 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -141,10 +141,6 @@ int main (int argc, char *argv[]) // Convert to time object Time interPacketInterval = Seconds (interval); - // disable fragmentation for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - // turn off RTS/CTS for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); // Fix non-unicast data rate to be the same as that of unicast Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode", StringValue (phyMode)); diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index b3b8f3001..9d8121ba2 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/examples/wireless/wifi-simple-adhoc.cc @@ -109,10 +109,6 @@ int main (int argc, char *argv[]) // Convert to time object Time interPacketInterval = Seconds (interval); - // disable fragmentation for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - // turn off RTS/CTS for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); // Fix non-unicast data rate to be the same as that of unicast Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode", StringValue (phyMode)); diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index 42e771a5d..a4b68e821 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -111,10 +111,6 @@ int main (int argc, char *argv[]) // Convert to time object Time interPacketInterval = Seconds (interval); - // disable fragmentation for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - // turn off RTS/CTS for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); // Fix non-unicast data rate to be the same as that of unicast Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode", StringValue (phyMode)); diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 157fc64d9..65a8decca 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -162,10 +162,6 @@ int main (int argc, char *argv[]) // Convert to time object Time interPacketInterval = Seconds (interval); - // disable fragmentation for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200")); - // turn off RTS/CTS for frames below 2200 bytes - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200")); // Fix non-unicast data rate to be the same as that of unicast Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode", StringValue (phyMode)); diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc index 2bd8378fc..4ff60fa32 100644 --- a/examples/wireless/wifi-tcp.cc +++ b/examples/wireless/wifi-tcp.cc @@ -89,11 +89,6 @@ main (int argc, char *argv[]) cmd.Parse (argc, argv); tcpVariant = std::string ("ns3::") + tcpVariant; - - /* No fragmentation and no RTS/CTS */ - Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("999999")); - Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999")); - // Select TCP variant if (tcpVariant.compare ("ns3::TcpWestwoodPlus") == 0) {