diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc index 26aa40654..efcdcfa17 100644 --- a/examples/wireless/wifi-spatial-reuse.cc +++ b/examples/wireless/wifi-spatial-reuse.cc @@ -54,7 +54,7 @@ // time. // // Note that, by default, this script configures a network using a -// channel bandwidth of 20 MHz. Changing this value alone (through +// channel width of 20 MHz. Changing this value alone (through // the --channelWidth argument) without properly adjusting other // parameters will void the effect of spatial reuse: since energy is // measured over the 20 MHz primary channel regardless of the channel @@ -69,11 +69,11 @@ // all these values by 3 dB compared to their defaults. // // In addition, consider that adapting the adjustments shown above -// for an 80 MHz bandwidth (using a 6 dB threshold adjustment instead +// for an 80 MHz channel width (using a 6 dB threshold adjustment instead // of 3 dB) will not produce any changes when enableObssPd is enabled // or disabled. The cause for this is the insufficient amount of // traffic that is generated by default in the example: increasing -// the bandwidth shortens the frame durations, and lowers the +// the channel width shortens the frame durations, and lowers the // collision probability. Collisions between BSSs are a necessary // condition to see the improvements brought by spatial reuse, and // thus increasing the amount of generated traffic by setting the @@ -134,7 +134,7 @@ main(int argc, char* argv[]) double ccaEdTrAp1 = -62; // dBm double ccaEdTrAp2 = -62; // dBm double minimumRssi = -82; // dBm - int channelBandwidth = 20; // MHz + int channelWidth = 20; // MHz uint32_t payloadSize = 1500; // bytes uint32_t mcs = 0; // MCS value double interval = 0.001; // seconds @@ -159,9 +159,7 @@ main(int argc, char* argv[]) cmd.AddValue("minimumRssi", "Minimum RSSI for the ThresholdPreambleDetectionModel", minimumRssi); - cmd.AddValue("channelBandwidth", - "Bandwidth of the channel in MHz [20, 40, or 80]", - channelBandwidth); + cmd.AddValue("channelWidth", "Bandwidth of the channel in MHz [20, 40, or 80]", channelWidth); cmd.AddValue("obssPdThreshold", "Threshold for the OBSS PD Algorithm", obssPdThreshold); cmd.AddValue("mcs", "The constant MCS value to transmit HE PPDUs", mcs); cmd.Parse(argc, argv); @@ -182,7 +180,7 @@ main(int argc, char* argv[]) spectrumPhy.SetChannel(spectrumChannel); spectrumPhy.SetErrorRateModel("ns3::YansErrorRateModel"); - switch (channelBandwidth) + switch (channelWidth) { case 20: spectrumPhy.Set("ChannelSettings", StringValue("{36, 20, BAND_5GHZ, 0}")); @@ -194,7 +192,7 @@ main(int argc, char* argv[]) spectrumPhy.Set("ChannelSettings", StringValue("{171, 80, BAND_5GHZ, 0}")); break; default: - NS_ABORT_MSG("Unrecognized channel bandwidth: " << channelBandwidth); + NS_ABORT_MSG("Unrecognized channel width: " << channelWidth); break; } spectrumPhy.SetPreambleDetectionModel("ns3::ThresholdPreambleDetectionModel",