Attachment #2305 for bug #2311

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

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

Lines 1425-1430 WifiRemoteStationManager::LookupState (Mac48Address address) const	Link Here

1425

  state->m_ness = 0;

1437

  state->m_ness = 0;

1426

  state->m_aggregation = false;

1438

  state->m_aggregation = false;

1427

  state->m_stbc = false;

1439

  state->m_stbc = false;

1440

  state->m_htSupported = false;

1441

  state->m_vhtSupported = false;

1428

  const_cast<WifiRemoteStationManager *> (this)->m_states.push_back (state);

1442

  const_cast<WifiRemoteStationManager *> (this)->m_states.push_back (state);

1429

  NS_LOG_DEBUG ("WifiRemoteStationManager::LookupState returning new state");

1443

  NS_LOG_DEBUG ("WifiRemoteStationManager::LookupState returning new state");

1430

  return state;

1444

  return state;

Lines 1484-1489 WifiRemoteStationManager::AddStationHtCapabilities (Mac48Address from, HtCapabil	Link Here

1484

1498

1485

      state->m_channelWidth = 20;

1499

      state->m_channelWidth = 20;

1486

1500

1501

  state->m_htSupported = true;

1487

  state->m_greenfield = htCapabilities.GetGreenfield ();

1502

  state->m_greenfield = htCapabilities.GetGreenfield ();

1488

1503

1489

1504

Lines 1508-1513 WifiRemoteStationManager::AddStationVhtCapabilities (Mac48Address from, VhtCapab	Link Here

1508

1523

1509

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

1524

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

1510

1525

1526

  state->m_vhtSupported = true;

1511

1527

1512

1528

1513

bool

1529

bool

Lines 1803-1808 WifiRemoteStationManager::GetNSupported (const WifiRemoteStation *station) const	Link Here

1803

  return station->m_state->m_operationalRateSet.size ();

1819

  return station->m_state->m_operationalRateSet.size ();

1804

1820

1805

1821

1822

bool

1823

WifiRemoteStationManager::GetHtSupported (const WifiRemoteStation *station) const

1824

1825

  return station->m_state->m_htSupported;

1826

1827

1828

bool

1829

WifiRemoteStationManager::GetVhtSupported (const WifiRemoteStation *station) const

1830

1831

  return station->m_state->m_vhtSupported;

1832

1833

1806

uint32_t

1834

uint32_t

1807

WifiRemoteStationManager::GetNMcsSupported (const WifiRemoteStation *station) const

1835

WifiRemoteStationManager::GetNMcsSupported (const WifiRemoteStation *station) const

1808

1836




   */
  uint32_t GetNSupported (const WifiRemoteStation *station) const;
  /**
   * Return whether the given station is HT capable.
   *
   * \param station the station being queried
   *
   * \return true if the station has HT capabilities,
   *         false otherwise
   */
  bool GetHtSupported (const WifiRemoteStation *station) const;
  /**
   * Return whether the given station is VHT capable.
   *
   * \param station the station being queried
   *
   * \return true if the station has VHT capabilities,
   *         false otherwise
   */
  bool GetVhtSupported (const WifiRemoteStation *station) const;
  /**
   * Return the WifiMode supported by the specified station at the specified index.
   *
   * \param station the station being queried

   *
   * \return the WifiMode at the given index of the specified station
   */

  WifiMode GetMcsSupported (const WifiRemoteStation *station, uint32_t i) const;
  /**
   * Return the number of MCS supported by the given station.

  bool m_greenfield;          //!< Flag if greenfield is supported by the remote station
  bool m_shortPreamble;       //!< Flag if short PLCP preamble is supported by the remote station
  bool m_shortSlotTime;       //!< Flag if short ERP slot time is supported by the remote station
  bool m_htSupported;         //!< Flag if HT is supported by the station
  bool m_vhtSupported;        //!< Flag if VHT is supported by the station
};

/**

Return to bug 2311