Attachment #870 for bug #843

View | Details | Raw Unified | Return to bug 843
Collapse All | Expand All

(-)a/examples/mpi/third-distributed.cc (-1 / +1 lines)

Lines 141-147	Link Here

141

  mac.SetType ("ns3::NqapWifiMac",

141

  mac.SetType ("ns3::NqapWifiMac",

142

    "Ssid", SsidValue (ssid),

142

    "Ssid", SsidValue (ssid),

143

    "BeaconGeneration", BooleanValue (true),

143

    "BeaconGeneration", BooleanValue (true),

144

    "BeaconInterval", TimeValue (Seconds (2.5)));

144

    "BeaconInterval", TimeValue (MicroSeconds (102400)));

145

146

  NetDeviceContainer apDevices;

146

  NetDeviceContainer apDevices;

147

  apDevices = wifi.Install (phy, mac, wifiApNode);

147

  apDevices = wifi.Install (phy, mac, wifiApNode);

(-)a/examples/tap/tap-wifi-dumbbell.cc (-1 / +1 lines)

Lines 142-148	Link Here

142

  wifiMac.SetType ("ns3::NqapWifiMac",

142

  wifiMac.SetType ("ns3::NqapWifiMac",

143

                   "Ssid", SsidValue (ssid),

143

                   "Ssid", SsidValue (ssid),

144

                   "BeaconGeneration", BooleanValue (true),

144

                   "BeaconGeneration", BooleanValue (true),

145

                   "BeaconInterval", TimeValue (Seconds (2.5)));

145

                   "BeaconInterval", TimeValue (MicroSeconds (102400)));

146

  NetDeviceContainer devicesLeft = wifi.Install (wifiPhy, wifiMac, nodesLeft.Get (0));

146

  NetDeviceContainer devicesLeft = wifi.Install (wifiPhy, wifiMac, nodesLeft.Get (0));

147

148

(-)a/examples/tutorial/third.cc (-1 / +1 lines)

Lines 101-107	Link Here

101

  mac.SetType ("ns3::NqapWifiMac",

101

  mac.SetType ("ns3::NqapWifiMac",

102

    "Ssid", SsidValue (ssid),

102

    "Ssid", SsidValue (ssid),

103

    "BeaconGeneration", BooleanValue (true),

103

    "BeaconGeneration", BooleanValue (true),

104

    "BeaconInterval", TimeValue (Seconds (2.5)));

104

    "BeaconInterval", TimeValue (MicroSeconds (102400)));

105

106

  NetDeviceContainer apDevices;

106

  NetDeviceContainer apDevices;

107

  apDevices = wifi.Install (phy, mac, wifiApNode);

107

  apDevices = wifi.Install (phy, mac, wifiApNode);

(-)a/examples/wireless/mixed-wireless.cc (-1 / +1 lines)

Lines 285-291	Link Here

285

      // setup ap.

285

      // setup ap.

286

      macInfra.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

286

      macInfra.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

287

               "BeaconGeneration", BooleanValue (true),

287

               "BeaconGeneration", BooleanValue (true),

288

               "BeaconInterval", TimeValue (Seconds (2.5)));

288

               "BeaconInterval", TimeValue (MicroSeconds (102400)));

289

      NetDeviceContainer apDevices = wifiInfra.Install (wifiPhy, macInfra, backbone.Get (i));

289

      NetDeviceContainer apDevices = wifiInfra.Install (wifiPhy, macInfra, backbone.Get (i));

290

      // Collect all of these new devices

290

      // Collect all of these new devices

291

      NetDeviceContainer infraDevices (apDevices, staDevices);

291

      NetDeviceContainer infraDevices (apDevices, staDevices);

(-)a/examples/wireless/simple-wifi-frame-aggregation.cc (-1 / +1 lines)

Lines 80-86	Link Here

  mac.SetType ("ns3::QapWifiMac",

  mac.SetType ("ns3::QapWifiMac",

    "Ssid", SsidValue (ssid),

    "Ssid", SsidValue (ssid),

    "BeaconGeneration", BooleanValue (true),

    "BeaconGeneration", BooleanValue (true),

    "BeaconInterval", TimeValue (Seconds (2.5)));

    "BeaconInterval", TimeValue (MicroSeconds (102400)));

  mac.SetMsduAggregatorForAc (AC_BE, "ns3::MsduStandardAggregator",

  mac.SetMsduAggregatorForAc (AC_BE, "ns3::MsduStandardAggregator",

                                     "MaxAmsduSize", UintegerValue (7935));

                                     "MaxAmsduSize", UintegerValue (7935));

(-)a/examples/wireless/wifi-ap.cc (-1 / +1 lines)

Lines 157-163	Link Here

157

  // setup ap.

157

  // setup ap.

158

  wifiMac.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

158

  wifiMac.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

159

               "BeaconGeneration", BooleanValue (true),

159

               "BeaconGeneration", BooleanValue (true),

160

               "BeaconInterval", TimeValue (Seconds (2.5)));

160

               "BeaconInterval", TimeValue (MicroSeconds (102400)));

161

  wifi.Install (wifiPhy, wifiMac, ap);

161

  wifi.Install (wifiPhy, wifiMac, ap);

162

163

  // mobility.

163

  // mobility.

(-)a/examples/wireless/wifi-blockack.cc (-1 / +1 lines)

Lines 78-84	Link Here

  NetDeviceContainer staDevice = wifi.Install (phy, mac, sta);

  NetDeviceContainer staDevice = wifi.Install (phy, mac, sta);

  mac.SetType ("ns3::QapWifiMac", "Ssid", SsidValue (ssid), "BeaconGeneration", BooleanValue (true),

  mac.SetType ("ns3::QapWifiMac", "Ssid", SsidValue (ssid), "BeaconGeneration", BooleanValue (true),

               "BeaconInterval", TimeValue (Seconds (2.5)));

               "BeaconInterval", TimeValue (MicroSeconds (102400)));

  mac.SetBlockAckThresholdForAc (AC_BE, 0);

  mac.SetBlockAckThresholdForAc (AC_BE, 0);

  NetDeviceContainer apDevice = wifi.Install (phy, mac, ap);

  NetDeviceContainer apDevice = wifi.Install (phy, mac, ap);

(-)a/examples/wireless/wifi-simple-infra.cc (-1 / +1 lines)

Lines 162-168	Link Here

162

  // setup ap.

162

  // setup ap.

163

  wifiMac.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

163

  wifiMac.SetType ("ns3::NqapWifiMac", "Ssid", SsidValue (ssid),

164

                   "BeaconGeneration", BooleanValue (true),

164

                   "BeaconGeneration", BooleanValue (true),

165

                   "BeaconInterval", TimeValue (Seconds (2.5)));

165

                   "BeaconInterval", TimeValue (MicroSeconds (102400)));

166

  NetDeviceContainer apDevice = wifi.Install (wifiPhy, wifiMac, c.Get(1));

166

  NetDeviceContainer apDevice = wifi.Install (wifiPhy, wifiMac, c.Get(1));

167

  devices.Add (apDevice);

167

  devices.Add (apDevice);

168

(-)a/examples/wireless/wifi-wired-bridging.cc (-1 / +1 lines)

Lines 127-133	Link Here

127

      wifiMac.SetType ("ns3::NqapWifiMac",

127

      wifiMac.SetType ("ns3::NqapWifiMac",

128

		   "Ssid", SsidValue (ssid),

128

		   "Ssid", SsidValue (ssid),

129

		   "BeaconGeneration", BooleanValue (true),

129

		   "BeaconGeneration", BooleanValue (true),

130

		   "BeaconInterval", TimeValue (Seconds (2.5)));

130

		   "BeaconInterval", TimeValue (MicroSeconds (102400)));

131

      apDev = wifi.Install (wifiPhy, wifiMac, backboneNodes.Get (i));

131

      apDev = wifi.Install (wifiPhy, wifiMac, backboneNodes.Get (i));

132

133

      NetDeviceContainer bridgeDev;

133

      NetDeviceContainer bridgeDev;

(-)a/src/devices/wifi/nqap-wifi-mac.cc (-1 / +5 lines)

Lines 50-56	Link Here

    .SetParent<WifiMac> ()

    .SetParent<WifiMac> ()

    .AddConstructor<NqapWifiMac> ()

    .AddConstructor<NqapWifiMac> ()

    .AddAttribute ("BeaconInterval", "Delay between two beacons",

    .AddAttribute ("BeaconInterval", "Delay between two beacons",

                   TimeValue (Seconds (0.1)),

                   TimeValue (MicroSeconds (102400)),

                   MakeTimeAccessor (&NqapWifiMac::GetBeaconInterval,

                   MakeTimeAccessor (&NqapWifiMac::GetBeaconInterval,

                                     &NqapWifiMac::SetBeaconInterval),

                                     &NqapWifiMac::SetBeaconInterval),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

Lines 280-285	Link Here

280

NqapWifiMac::SetBeaconInterval (Time interval)

280

NqapWifiMac::SetBeaconInterval (Time interval)

281

282

  NS_LOG_FUNCTION (this << interval);

282

  NS_LOG_FUNCTION (this << interval);

283

  if ((interval.GetMicroSeconds () % 1024) != 0)

284

285

      NS_LOG_WARN ("beacon interval should be multiple of 1024us, see IEEE Std. 802.11-2007, section 11.1.1.1");

286

283

  m_beaconInterval = interval;

287

  m_beaconInterval = interval;

284

288

285

void

289

void

(-)a/src/devices/wifi/qap-wifi-mac.cc (-1 / +5 lines)

Lines 52-58	Link Here

    .SetParent<WifiMac> ()

    .SetParent<WifiMac> ()

    .AddConstructor<QapWifiMac> ()

    .AddConstructor<QapWifiMac> ()

    .AddAttribute ("BeaconInterval", "Delay between two beacons",

    .AddAttribute ("BeaconInterval", "Delay between two beacons",

                   TimeValue (Seconds (0.1)),

                   TimeValue (MicroSeconds (102400)),

                   MakeTimeAccessor (&QapWifiMac::GetBeaconInterval,

                   MakeTimeAccessor (&QapWifiMac::GetBeaconInterval,

                                     &QapWifiMac::SetBeaconInterval),

                                     &QapWifiMac::SetBeaconInterval),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

Lines 352-357	Link Here

352

QapWifiMac::SetBeaconInterval (Time interval)

352

QapWifiMac::SetBeaconInterval (Time interval)

353

354

  NS_LOG_FUNCTION (this << interval);

354

  NS_LOG_FUNCTION (this << interval);

355

  if ((interval.GetMicroSeconds () % 1024) != 0)

356

357

      NS_LOG_WARN ("beacon interval should be multiple of 1024us, see IEEE Std. 802.11-2007, section 11.1.1.1");

358

355

  m_beaconInterval = interval;

359

  m_beaconInterval = interval;

356

360

357

361

Return to bug 843