Attachment #2142 for bug #2003

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

(-)a/src/wifi/model/ap-wifi-mac.cc (-1 / +13 lines)

Lines 334-339	Link Here

334

  return rates;

334

  return rates;

335

336

337

CapabilityInformation

338

ApWifiMac::GetCapabilities (void) const

339

340

  CapabilityInformation capabilities;

341

  capabilities.SetShortPreamble (m_phy->GetShortPlcpPreamble ());

342

  return capabilities;

343

344

337

HtCapabilities

345

HtCapabilities

338

ApWifiMac::GetHtCapabilities (void) const

346

ApWifiMac::GetHtCapabilities (void) const

339

347

Lines 417-422	Link Here

417

  probe.SetSsid (GetSsid ());

425

  probe.SetSsid (GetSsid ());

418

  probe.SetSupportedRates (GetSupportedRates ());

426

  probe.SetSupportedRates (GetSupportedRates ());

419

  probe.SetBeaconIntervalUs (m_beaconInterval.GetMicroSeconds ());

427

  probe.SetBeaconIntervalUs (m_beaconInterval.GetMicroSeconds ());

428

  probe.SetCapabilities (GetCapabilities ());

420

  if (m_htSupported || m_vhtSupported)

429

  if (m_htSupported || m_vhtSupported)

421

430

422

      probe.SetHtCapabilities (GetHtCapabilities ());

431

      probe.SetHtCapabilities (GetHtCapabilities ());

Lines 459-465	Link Here

459

468

460

  assoc.SetSupportedRates (GetSupportedRates ());

469

  assoc.SetSupportedRates (GetSupportedRates ());

461

  assoc.SetStatusCode (code);

470

  assoc.SetStatusCode (code);

462

471

  assoc.SetCapabilities (GetCapabilities ());

463

  if (m_htSupported || m_vhtSupported)

472

  if (m_htSupported || m_vhtSupported)

464

473

465

      assoc.SetHtCapabilities (GetHtCapabilities ());

474

      assoc.SetHtCapabilities (GetHtCapabilities ());

Lines 494-499	Link Here

494

  beacon.SetSsid (GetSsid ());

503

  beacon.SetSsid (GetSsid ());

495

  beacon.SetSupportedRates (GetSupportedRates ());

504

  beacon.SetSupportedRates (GetSupportedRates ());

496

  beacon.SetBeaconIntervalUs (m_beaconInterval.GetMicroSeconds ());

505

  beacon.SetBeaconIntervalUs (m_beaconInterval.GetMicroSeconds ());

506

  beacon.SetCapabilities (GetCapabilities ());

497

  if (m_htSupported || m_vhtSupported)

507

  if (m_htSupported || m_vhtSupported)

498

508

499

      beacon.SetHtCapabilities (GetHtCapabilities ());

509

      beacon.SetHtCapabilities (GetHtCapabilities ());

Lines 630-635	Link Here

630

              //rate set is compatible with our Basic Rate set

640

              //rate set is compatible with our Basic Rate set

631

              MgtAssocRequestHeader assocReq;

641

              MgtAssocRequestHeader assocReq;

632

              packet->RemoveHeader (assocReq);

642

              packet->RemoveHeader (assocReq);

643

              CapabilityInformation capabilities = assocReq.GetCapabilities ();

644

              m_stationManager->AddSupportedPlcpPreamble (from, capabilities.IsShortPreamble ());

633

              SupportedRates rates = assocReq.GetSupportedRates ();

645

              SupportedRates rates = assocReq.GetSupportedRates ();

634

              bool problem = false;

646

              bool problem = false;

635

              for (uint32_t i = 0; i < m_stationManager->GetNBasicModes (); i++)

647

              for (uint32_t i = 0; i < m_stationManager->GetNBasicModes (); i++)




#define AP_WIFI_MAC_H

#include "regular-wifi-mac.h"
#include "capability-information.h"
#include "ht-capabilities.h"
#include "vht-capabilities.h"
#include "amsdu-subframe-header.h"
#include "supported-rates.h"
#include "ns3/random-variable-stream.h"
#include "vht-capabilities.h"

namespace ns3 {


   */
  void SendOneBeacon (void);
  /**
   * Return the Capability information of the current AP.
   *
   * \return the Capability information that we support
   */
  CapabilityInformation GetCapabilities (void) const;
  /**
   * Return the HT capability of the current AP.
   *
   * \return the HT capability that we support

(-)a/src/wifi/model/capability-information.cc (+17 lines)

Lines 47-52	Link Here

  Set (1);

  Set (1);

void

CapabilityInformation::SetShortPreamble (bool shortPreamble)

  NS_LOG_FUNCTION (this);

  if (shortPreamble)

      Set (5);

bool

bool

CapabilityInformation::IsEss (void) const

CapabilityInformation::IsEss (void) const

Lines 61-66	Link Here

  return Is (1);

  return Is (1);

bool

CapabilityInformation::IsShortPreamble (void) const

  NS_LOG_FUNCTION (this);

  return Is (5);

void

void

CapabilityInformation::Set (uint8_t n)

CapabilityInformation::Set (uint8_t n)

(-)a/src/wifi/model/capability-information.h (+16 lines)

Lines 46-51	Link Here

   * in the capability information field.

   * in the capability information field.

*/

*/

  void SetIbss (void);

  void SetIbss (void);

/**

   * Set the short preamble bit

   * in the capability information field.

   * shortPreamble the short preamble bit

*/

  void SetShortPreamble (bool shortPreamble);

/**

/**

   * Check if the Extended Service Set (ESS) bit

   * Check if the Extended Service Set (ESS) bit

Lines 63-68	Link Here

   *         field is set to 1

   *         field is set to 1

*/

*/

  bool IsIbss (void) const;

  bool IsIbss (void) const;

/**

   * Check if the short preamble bit

   * in the capability information field is set to 1.

   * \return short preamble bit in the capability information

   *         field is set to 1

*/

  bool IsShortPreamble (void) const;

/**

/**

   * Return the serialized size of capability

   * Return the serialized size of capability

(-)a/src/wifi/model/mac-low.cc (+24 lines)

Lines 1422-1427	Link Here

1422

1423

      preamble = WIFI_PREAMBLE_HT_MF;

1423

      preamble = WIFI_PREAMBLE_HT_MF;

1424

1425

  else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

1426

1427

      preamble = WIFI_PREAMBLE_SHORT;

1428

1425

  else

1429

  else

1426

1430

1427

      preamble = WIFI_PREAMBLE_LONG;

1431

      preamble = WIFI_PREAMBLE_LONG;

Lines 1458-1463	Link Here

1458

1462

1459

          preamble = WIFI_PREAMBLE_HT_MF;

1463

          preamble = WIFI_PREAMBLE_HT_MF;

1460

1464

1465

      else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

1466

1467

          preamble = WIFI_PREAMBLE_SHORT;

1468

1461

      else

1469

      else

1462

1470

1463

          preamble = WIFI_PREAMBLE_LONG;

1471

          preamble = WIFI_PREAMBLE_LONG;

Lines 1862-1867	Link Here

1862

1870

1863

      preamble = WIFI_PREAMBLE_HT_MF;

1871

      preamble = WIFI_PREAMBLE_HT_MF;

1864

1872

1873

  else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

1874

1875

      preamble = WIFI_PREAMBLE_SHORT;

1876

1865

  else

1877

  else

1866

1878

1867

      preamble = WIFI_PREAMBLE_LONG;

1879

      preamble = WIFI_PREAMBLE_LONG;

Lines 1946-1951	Link Here

1946

1958

1947

      preamble = WIFI_PREAMBLE_HT_MF;

1959

      preamble = WIFI_PREAMBLE_HT_MF;

1948

1960

1961

  else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

1962

1963

      preamble = WIFI_PREAMBLE_SHORT;

1964

1949

  else

1965

  else

1950

1966

1951

      preamble = WIFI_PREAMBLE_LONG;

1967

      preamble = WIFI_PREAMBLE_LONG;

Lines 2176-2181	Link Here

2176

2192

2177

      preamble = WIFI_PREAMBLE_HT_MF;

2193

      preamble = WIFI_PREAMBLE_HT_MF;

2178

2194

2195

  else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

2196

2197

      preamble = WIFI_PREAMBLE_SHORT;

2198

2179

  else

2199

  else

2180

2200

2181

      preamble = WIFI_PREAMBLE_LONG;

2201

      preamble = WIFI_PREAMBLE_LONG;

Lines 2814-2819	Link Here

2814

2834

2815

      preamble = WIFI_PREAMBLE_HT_MF;

2835

      preamble = WIFI_PREAMBLE_HT_MF;

2816

2836

2837

  else if (m_phy->GetShortPlcpPreamble () && m_stationManager->GetShortPreambleSupported (m_currentHdr.GetAddr1 ()))

2838

2839

      preamble = WIFI_PREAMBLE_SHORT;

2840

2817

  else

2841

  else

2818

2842

2819

      preamble = WIFI_PREAMBLE_LONG;

2843

      preamble = WIFI_PREAMBLE_LONG;

(-)a/src/wifi/model/mgt-headers.cc (-9 / +45 lines)

Lines 186-191	Link Here

186

187

188

void

188

void

189

MgtProbeResponseHeader::SetCapabilities (CapabilityInformation capabilities)

190

191

  m_capability = capabilities;

192

193

194

CapabilityInformation

195

MgtProbeResponseHeader::GetCapabilities (void) const

196

197

  return m_capability;

198

199

200

void

189

MgtProbeResponseHeader::SetHtCapabilities (HtCapabilities htcapabilities)

201

MgtProbeResponseHeader::SetHtCapabilities (HtCapabilities htcapabilities)

190

202

191

  m_htCapability = htcapabilities;

203

  m_htCapability = htcapabilities;

Lines 358-372	Link Here

358

370

359

371

360

void

372

void

373

MgtAssocRequestHeader::SetListenInterval (uint16_t interval)

374

375

  m_listenInterval = interval;

376

377

378

void

379

MgtAssocRequestHeader::SetCapabilities (CapabilityInformation capabilities)

380

381

  m_capability = capabilities;

382

383

384

CapabilityInformation

385

MgtAssocRequestHeader::GetCapabilities (void) const

386

387

  return m_capability;

388

389

390

void

361

MgtAssocRequestHeader::SetHtCapabilities (HtCapabilities htcapabilities)

391

MgtAssocRequestHeader::SetHtCapabilities (HtCapabilities htcapabilities)

362

392

363

  m_htCapability = htcapabilities;

393

  m_htCapability = htcapabilities;

364

394

365

395

366

void

396

HtCapabilities

367

MgtAssocRequestHeader::SetListenInterval (uint16_t interval)

397

MgtAssocRequestHeader::GetHtCapabilities (void) const

368

398

369

  m_listenInterval = interval;

399

  return m_htCapability;

370

400

371

401

372

void

402

void

Lines 381-392	Link Here

381

  return m_vhtCapability;

411

  return m_vhtCapability;

382

412

383

413

384

HtCapabilities

385

MgtAssocRequestHeader::GetHtCapabilities (void) const

386

387

  return m_htCapability;

388

389

390

Ssid

414

Ssid

391

MgtAssocRequestHeader::GetSsid (void) const

415

MgtAssocRequestHeader::GetSsid (void) const

392

416

Lines 513-518	Link Here

513

537

514

538

515

void

539

void

540

MgtAssocResponseHeader::SetCapabilities (CapabilityInformation capabilities)

541

542

  m_capability = capabilities;

543

544

545

CapabilityInformation

546

MgtAssocResponseHeader::GetCapabilities (void) const

547

548

  return m_capability;

549

550

551

void

516

MgtAssocResponseHeader::SetHtCapabilities (HtCapabilities htcapabilities)

552

MgtAssocResponseHeader::SetHtCapabilities (HtCapabilities htcapabilities)

517

553

518

  m_htCapability = htcapabilities;

554

  m_htCapability = htcapabilities;




#include "supported-rates.h"
#include "ssid.h"
#include "ht-capabilities.h"
#include "ht-capabilities.h"
#include "vht-capabilities.h"

namespace ns3 {

   */
  void SetListenInterval (uint16_t interval);
  /**
   * Set the Capability information.
   *
   * \param capabilities Capability information
   */
  void SetCapabilities (CapabilityInformation capabilities);
  /**
   * Set the HT capabilities.
   *
   * \param htcapabilities HT capabilities

    */
  void SetVhtCapabilities (VhtCapabilities vhtcapabilities);
  /**
   * Return the Capability information.
   *
   * \return Capability information
   */
  CapabilityInformation GetCapabilities (void) const;

  /**
   * Return the HT capabilities.
   *
   * \return HT capabilities
   */
  HtCapabilities GetHtCapabilities (void) const;
  /**
  * Return the VHT capabilities.
  *
  * \return VHT capabilities
  */
  VhtCapabilities GetVhtCapabilities (void) const;

  /**
   * Return the Service Set Identifier (SSID).

   */
  SupportedRates GetSupportedRates (void);
  /**
   * Return the Capability information.
   *
   * \return Capability information
   */
  CapabilityInformation GetCapabilities (void) const;
  /**
   * Set the Capability information.
   *
   * \param capabilities Capability information
   */
  void SetCapabilities (CapabilityInformation capabilities);
  /**
   * Return the HT capabilities.
   *
   * \return HT capabilities

   */
  SupportedRates GetSupportedRates (void) const;
  /**
   * Return the Capability information.
   *
   * \return Capability information
   */
  CapabilityInformation GetCapabilities (void) const;
  /**
   * Return the HT capabilities.
   *
   * \return HT capabilities
   */
  HtCapabilities GetHtCapabilities (void) const;
  /**
   * Set the VHT capabilities.
   *
   * \param vhtcapabilities VHT capabilities
   */
  void SetVhtCapabilities (VhtCapabilities vhtcapabilities);
  /**
  * Return the VHT capabilities.
  *
  * \return VHT capabilities
  */
  VhtCapabilities GetVhtCapabilities (void) const;
  /**
   * Set the Capability information.
   *
   * \param capabilities Capability information
   */
  void SetCapabilities (CapabilityInformation capabilities);
  /**
   * Set the HT capabilities.
   *
   * \param htcapabilities HT capabilities
   */
  void SetHtCapabilities (HtCapabilities htcapabilities);
  /**
   * Set the VHT capabilities.
   *
   * \param vhtcapabilities VHT capabilities
   */
  void SetVhtCapabilities (VhtCapabilities vhtcapabilities);
  /**
   * Set the Service Set Identifier (SSID).
   *
   * \param ssid SSID

(-)a/src/wifi/model/sta-wifi-mac.cc (+11 lines)

Lines 222-227	Link Here

222

  MgtAssocRequestHeader assoc;

222

  MgtAssocRequestHeader assoc;

223

  assoc.SetSsid (GetSsid ());

223

  assoc.SetSsid (GetSsid ());

224

  assoc.SetSupportedRates (GetSupportedRates ());

224

  assoc.SetSupportedRates (GetSupportedRates ());

225

  assoc.SetCapabilities (GetCapabilities ());

225

  if (m_htSupported || m_vhtSupported)

226

  if (m_htSupported || m_vhtSupported)

226

227

      assoc.SetHtCapabilities (GetHtCapabilities ());

228

      assoc.SetHtCapabilities (GetHtCapabilities ());

Lines 558-563	Link Here

558

559

          MgtAssocResponseHeader assocResp;

560

          MgtAssocResponseHeader assocResp;

560

          packet->RemoveHeader (assocResp);

561

          packet->RemoveHeader (assocResp);

562

          CapabilityInformation capabilities = assocResp.GetCapabilities ();

563

          m_stationManager->AddSupportedPlcpPreamble (hdr->GetAddr2 (), capabilities.IsShortPreamble ());

561

          if (m_assocRequestEvent.IsRunning ())

564

          if (m_assocRequestEvent.IsRunning ())

562

565

563

              m_assocRequestEvent.Cancel ();

566

              m_assocRequestEvent.Cancel ();

Lines 655-660	Link Here

655

  return rates;

658

  return rates;

656

659

657

660

661

CapabilityInformation

662

StaWifiMac::GetCapabilities (void) const

663

664

  CapabilityInformation capabilities;

665

  capabilities.SetShortPreamble (m_phy->GetShortPlcpPreamble ());

666

  return capabilities;

667

668

658

HtCapabilities

669

HtCapabilities

659

StaWifiMac::GetHtCapabilities (void) const

670

StaWifiMac::GetHtCapabilities (void) const

660

671




#include "ns3/traced-callback.h"
#include "supported-rates.h"
#include "amsdu-subframe-header.h"
#include "capability-information.h"

namespace ns3  {


   */
  void SetState (enum MacState value);
  /**
   * Return the Capability information of the current STA.
   *
   * \return the Capability information that we support
   */
  CapabilityInformation GetCapabilities (void) const;
  /**
   * Return the HT capability of the current STA.
   *
   * \return the HT capability that we support
   */
  HtCapabilities GetHtCapabilities (void) const;
  /**
   * Return the VHT capability of the current STA.
   *
   * \return the VHT capability that we support
   */




      return WifiPhy::GetErpOfdmRate6Mbps ();
    case WIFI_MOD_CLASS_DSSS:
    case WIFI_MOD_CLASS_HR_DSSS:
      if (preamble == WIFI_PREAMBLE_LONG || payloadMode == WifiPhy::GetDsssRate1Mbps ())
        {
          //(Section 16.2.3 "PLCP field definitions" and Section 17.2.2.2 "Long PPDU format"; IEEE Std 802.11-2012)
          return WifiPhy::GetDsssRate1Mbps ();

      return MicroSeconds (4);
    case WIFI_MOD_CLASS_DSSS:
    case WIFI_MOD_CLASS_HR_DSSS:
      if ((preamble == WIFI_PREAMBLE_SHORT) && (txVector.GetMode ().GetDataRate (22, 0, 1) > 1000000))
        {
          //(Section 17.2.2.3 "Short PPDU format" and Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds (24);

      return MicroSeconds (16);
    case WIFI_MOD_CLASS_DSSS:
    case WIFI_MOD_CLASS_HR_DSSS:
      if ((preamble == WIFI_PREAMBLE_SHORT) && (txVector.GetMode ().GetDataRate (22, 0, 1) > 1000000))
        {
          //(Section 17.2.2.3 "Short PPDU format)" Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds (72);

(-)a/src/wifi/model/wifi-phy.h (+8 lines)

Lines 1220-1225	Link Here

1220

*/

1220

*/

1221

  virtual bool GetGreenfield (void) const = 0;

1221

  virtual bool GetGreenfield (void) const = 0;

1222

/**

1222

/**

1223

   * \param shortPreamble Enable or disable short PLCP preamble

1224

*/

1225

  virtual void SetShortPlcpPreamble (bool shortPreamble) = 0;

1226

/**

1227

   * \return true if short PLCP preamble is supported, false otherwise

1228

*/

1229

  virtual bool GetShortPlcpPreamble (void) const = 0;

1230

/**

1223

   * \return the channel width

1231

   * \return the channel width

1224

*/

1232

*/

1225

  virtual uint32_t GetChannelWidth (void) const = 0;

1233

  virtual uint32_t GetChannelWidth (void) const = 0;

(-)a/src/wifi/model/wifi-remote-station-manager.cc (+22 lines)

Lines 480-485	Link Here

480

481

482

void

482

void

483

WifiRemoteStationManager::AddSupportedPlcpPreamble (Mac48Address address, bool isShortPreambleSupported)

484

485

  NS_LOG_FUNCTION (this << address << isShortPreambleSupported);

486

  NS_ASSERT (!address.IsGroup ());

487

  WifiRemoteStationState *state = LookupState (address);

488

  state->m_shortPreamble = isShortPreambleSupported;

489

490

491

void

483

WifiRemoteStationManager::AddSupportedMode (Mac48Address address, WifiMode mode)

492

WifiRemoteStationManager::AddSupportedMode (Mac48Address address, WifiMode mode)

484

493

485

  NS_LOG_FUNCTION (this << address << mode);

494

  NS_LOG_FUNCTION (this << address << mode);

Lines 1305-1310	Link Here

1305

  state->m_channelWidth = m_wifiPhy->GetChannelWidth ();

1314

  state->m_channelWidth = m_wifiPhy->GetChannelWidth ();

1306

  state->m_shortGuardInterval = m_wifiPhy->GetGuardInterval ();

1315

  state->m_shortGuardInterval = m_wifiPhy->GetGuardInterval ();

1307

  state->m_greenfield = m_wifiPhy->GetGreenfield ();

1316

  state->m_greenfield = m_wifiPhy->GetGreenfield ();

1317

  state->m_shortPreamble = m_wifiPhy->GetShortPlcpPreamble ();

1308

  state->m_rx = 1;

1318

  state->m_rx = 1;

1309

  state->m_tx = 1;

1319

  state->m_tx = 1;

1310

  state->m_ness = 0;

1320

  state->m_ness = 0;

Lines 1401-1406	Link Here

1401

  return LookupState (address)->m_greenfield;

1411

  return LookupState (address)->m_greenfield;

1402

1412

1403

1413

1414

bool

1415

WifiRemoteStationManager::GetShortPreambleSupported (Mac48Address address) const

1416

1417

  return LookupState (address)->m_shortPreamble;

1418

1419

1404

WifiMode

1420

WifiMode

1405

WifiRemoteStationManager::GetDefaultMode (void) const

1421

WifiRemoteStationManager::GetDefaultMode (void) const

1406

1422

Lines 1561-1566	Link Here

1561

1577

1562

1578

1563

bool

1579

bool

1580

WifiRemoteStationManager::GetShortPreamble (const WifiRemoteStation *station) const

1581

1582

  return station->m_state->m_shortPreamble;

1583

1584

1585

bool

1564

WifiRemoteStationManager::GetAggregation (const WifiRemoteStation *station) const

1586

WifiRemoteStationManager::GetAggregation (const WifiRemoteStation *station) const

1565

1587

1566

  return station->m_state->m_aggregation;

1588

  return station->m_state->m_aggregation;

(-)a/src/wifi/model/wifi-remote-station-manager.h (-2 / +28 lines)

Lines 244-249	Link Here

244

*/

244

*/

245

  bool GetGreenfieldSupported (Mac48Address address) const;

245

  bool GetGreenfieldSupported (Mac48Address address) const;

246

/**

246

/**

247

   * Return whether the station supports short PLCP preamble or not.

248

249

   * \param address the address of the station

250

251

   * \return true if short PLCP preamble is supported by the station,

252

   *         false otherwise

253

*/

254

  bool GetShortPreambleSupported (Mac48Address address) const;

255

/**

247

   * Add a given Modulation and Coding Scheme (MCS) index to

256

   * Add a given Modulation and Coding Scheme (MCS) index to

248

   * the set of basic MCS.

257

   * the set of basic MCS.

249

258

Lines 285-291	Link Here

285

*/

294

*/

286

  WifiMode GetNonUnicastMode (void) const;

295

  WifiMode GetNonUnicastMode (void) const;

287

296

288

289

/**

297

/**

290

   * Invoked in an AP upon disassociation of a

298

   * Invoked in an AP upon disassociation of a

291

   * specific STA.

299

   * specific STA.

Lines 315-320	Link Here

315

  void AddAllSupportedModes (Mac48Address address);

323

  void AddAllSupportedModes (Mac48Address address);

316

324

317

/**

325

/**

326

   * Record whether the short PLCP preamble is supported by the station.

327

328

   * \param address the address of the station

329

   * \param isShortPreambleSupported whether or not short PLCP preamble is supported by the station

330

*/

331

  void AddSupportedPlcpPreamble (Mac48Address address, bool isShortPreambleSupported);

332

333

/**

318

   * Return whether the station state is brand new.

334

   * Return whether the station state is brand new.

319

335

320

   * \param address the address of the station

336

   * \param address the address of the station

Lines 713-718	Link Here

713

*/

729

*/

714

  bool GetGreenfield (const WifiRemoteStation *station) const;

730

  bool GetGreenfield (const WifiRemoteStation *station) const;

715

/**

731

/**

732

   * Return whether the station supports short PLCP preamble or not.

733

734

   * \param station the station being queried

735

736

   * \return true if short PLCP preamble is supported by the station,

737

   *         false otherwise

738

*/

739

  bool GetShortPreamble (const WifiRemoteStation *station) const;

740

/**

716

   * Return the number of receive antennas the station has.

741

   * Return the number of receive antennas the station has.

717

742

718

   * \param station the station being queried

743

   * \param station the station being queried

Lines 1114-1120	Link Here

1114

  uint32_t m_ness;            //!< Number of streams in beamforming of the remote station

1139

  uint32_t m_ness;            //!< Number of streams in beamforming of the remote station

1115

  bool m_stbc;                //!< Flag if STBC is used by the remote station

1140

  bool m_stbc;                //!< Flag if STBC is used by the remote station

1116

  bool m_aggregation;         //!< Flag if MPDU aggregation is used by the remote station

1141

  bool m_aggregation;         //!< Flag if MPDU aggregation is used by the remote station

1117

  bool m_greenfield;          //!< Flag if green field is used by the remote station

1142

  bool m_greenfield;          //!< Flag if greenfield is used by the remote station

1143

  bool m_shortPreamble;       //!< Flag if short PLCP preamble is used by the remote station

1118

};

1144

};

1119

1145

1120

/**

1146

/**

(-)a/src/wifi/model/yans-wifi-phy.cc (+18 lines)

Lines 167-172	Link Here

167

                   MakeBooleanAccessor (&YansWifiPhy::GetGreenfield,

167

                   MakeBooleanAccessor (&YansWifiPhy::GetGreenfield,

168

                                        &YansWifiPhy::SetGreenfield),

168

                                        &YansWifiPhy::SetGreenfield),

169

                   MakeBooleanChecker ())

169

                   MakeBooleanChecker ())

170

    .AddAttribute ("ShortPlcpPreambleEnabled",

171

                   "Whether or not short PLCP preamble is enabled.",

172

                   BooleanValue (false),

173

                   MakeBooleanAccessor (&YansWifiPhy::GetShortPlcpPreamble,

174

                                        &YansWifiPhy::SetShortPlcpPreamble),

175

                   MakeBooleanChecker ())

170

    .AddAttribute ("ChannelWidth",

176

    .AddAttribute ("ChannelWidth",

171

                   "Whether 5MHz, 10MHz, 20MHz, 22MHz, 40MHz, 80 MHz or 160 MHz.",

177

                   "Whether 5MHz, 10MHz, 20MHz, 22MHz, 40MHz, 80 MHz or 160 MHz.",

172

                   UintegerValue (20),

178

                   UintegerValue (20),

Lines 1278-1283	Link Here

1278

  return m_greenfield;

1284

  return m_greenfield;

1279

1285

1280

1286

1287

bool

1288

YansWifiPhy::GetShortPlcpPreamble (void) const

1289

1290

  return m_plcpPreamble;

1291

1292

1293

void

1294

YansWifiPhy::SetShortPlcpPreamble (bool preamble)

1295

1296

  m_plcpPreamble = preamble;

1297

1298

1281

void

1299

void

1282

YansWifiPhy::SetChannelWidth (uint32_t channelwidth)

1300

YansWifiPhy::SetChannelWidth (uint32_t channelwidth)

1283

1301




   */
  virtual bool GetGreenfield (void) const;
  /**
   * Enable or disable short PLCP preamble.
   *
   * \param sets short PLCP preamble is supported or not
   */
  virtual void SetShortPlcpPreamble (bool preamble);
  /**
   * Return whether short PLCP preamble is supported.
   *
   * \returns if short PLCP preamble is supported or not
   */
  virtual bool GetShortPlcpPreamble (void) const;
  /**
   * Return channel width.
   *
   * \return channel width

  bool     m_greenfield;            //!< Flag if GreenField format is supported
  bool     m_guardInterval;         //!< Flag if short guard interval is used
  uint32_t m_channelWidth;          //!< Channel width
  bool     m_plcpPreamble;          //!< Flag if short PLCP preamble is used

  /**
   * This vector holds the set of transmission modes that this

(-)a/src/wifi/test/tx-duration-test.cc (-4 / +4 lines)

Lines 223-232	Link Here

223

    && CheckTxDuration (1024, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4096 + 192)

223

    && CheckTxDuration (1024, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4096 + 192)

224

    && CheckTxDuration (1025, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4100 + 192)

224

    && CheckTxDuration (1025, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4100 + 192)

225

    && CheckTxDuration (1026, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4104 + 192)

225

    && CheckTxDuration (1026, WifiPhy::GetDsssRate2Mbps (), 22, false, WIFI_PREAMBLE_LONG, 4104 + 192)

226

    && CheckTxDuration (1023, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8184 + 96)

226

    && CheckTxDuration (1023, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8184 + 192)

227

    && CheckTxDuration (1024, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8192 + 96)

227

    && CheckTxDuration (1024, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8192 + 192)

228

    && CheckTxDuration (1025, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8200 + 96)

228

    && CheckTxDuration (1025, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8200 + 192)

229

    && CheckTxDuration (1026, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8208 + 96)

229

    && CheckTxDuration (1026, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_SHORT, 8208 + 192)

230

    && CheckTxDuration (1023, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8184 + 192)

230

    && CheckTxDuration (1023, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8184 + 192)

231

    && CheckTxDuration (1024, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8192 + 192)

231

    && CheckTxDuration (1024, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8192 + 192)

232

    && CheckTxDuration (1025, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8200 + 192)

232

    && CheckTxDuration (1025, WifiPhy::GetDsssRate1Mbps (), 22, false, WIFI_PREAMBLE_LONG, 8200 + 192)

Return to bug 2003