Attachment #2843 for bug #2739

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

(-)a/src/wifi/model/ht-capabilities.cc (-2 / +8 lines)

Lines 179-185 HtCapabilities::SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal)	Link Here

179

void

179

void

180

HtCapabilities::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)

180

HtCapabilities::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)

181

182

  m_txMaxNSpatialStreams = maxtxspatialstreams;

182

  m_txMaxNSpatialStreams = maxtxspatialstreams - 1; //0 for 1 SS, 1 for 2 SSs, etc

183

184

185

void

185

void

Lines 236-241 HtCapabilities::GetMaxAmpduLength (void) const	Link Here

236

  return m_maxAmpduLength;

236

  return m_maxAmpduLength;

237

238

239

uint8_t

240

HtCapabilities::GetMinMpduStartSpace (void) const

241

242

  return m_minMpduStartSpace;

243

244

239

uint8_t*

245

uint8_t*

240

HtCapabilities::GetRxMcsBitmask ()

246

HtCapabilities::GetRxMcsBitmask ()

241

247

Lines 292-298 HtCapabilities::GetTxRxMcsSetUnequal (void) const	Link Here

292

uint8_t

298

uint8_t

293

HtCapabilities::GetTxMaxNSpatialStreams (void) const

299

HtCapabilities::GetTxMaxNSpatialStreams (void) const

294

300

295

  return m_txMaxNSpatialStreams;

301

  return m_txMaxNSpatialStreams; //0 for 1 SS, 1 for 2 SSs, etc

296

302

297

303

298

uint8_t

304

uint8_t

(-)a/src/wifi/model/ht-capabilities.h (+6 lines)

Lines 268-273 public:	Link Here

268

   * \return the maximum AMPDU length

268

   * \return the maximum AMPDU length

269

*/

269

*/

270

  uint8_t GetMaxAmpduLength (void) const;

270

  uint8_t GetMaxAmpduLength (void) const;

271

/**

272

   * Return the minimum MPDU start space.

273

274

   * \return the minimum MPDU start space

275

*/

276

  uint8_t GetMinMpduStartSpace (void) const;

271

277

272

/**

278

/**

273

   * Return the receive MCS bitmask.

279

   * Return the receive MCS bitmask.




      capabilities.SetShortGuardInterval20 (m_phy->GetShortGuardInterval ());
      capabilities.SetShortGuardInterval40 (m_phy->GetChannelWidth () >= 40 && m_phy->GetShortGuardInterval ());
      capabilities.SetGreenfield (m_phy->GetGreenfield ());
      uint32_t maxAmsduLength = std::max (std::max (m_beMaxAmsduSize, m_bkMaxAmsduSize), std::max (m_voMaxAmsduSize, m_viMaxAmsduSize));
      capabilities.SetMaxAmsduLength (maxAmsduLength > 3839); //0 if 3839 and 1 if 7935
      capabilities.SetLSigProtectionSupport (!m_phy->GetGreenfield ());
      uint32_t maxAmpduLength = std::max (std::max (m_beMaxAmpduSize, m_bkMaxAmpduSize), std::max (m_voMaxAmpduSize, m_viMaxAmpduSize));
      capabilities.SetMaxAmpduLength (uint8_t (std::max (3.0, std::ceil (std::log (maxAmpduLength + 1.0) - 13.0)))); //0 to 3 for HT
      uint64_t maxSupportedRate = 0; //in bit/s
      for (uint8_t i = 0; i < m_phy->GetNMcs (); i++)
        {

        {
          capabilities.SetSupportedChannelWidthSet (0);
        }
      uint32_t maxMpduLength = std::max (std::max (m_beMaxAmsduSize, m_bkMaxAmsduSize), std::max (m_voMaxAmsduSize, m_viMaxAmsduSize)) + 56; //see section 9.11 of 11ac standard
      capabilities.SetMaxMpduLength (uint8_t (maxMpduLength > 3895) + uint8_t (maxMpduLength > 7991)); //0 if 3895, 1 if 7991, 2 for 11454
      capabilities.SetRxLdpc (m_phy->GetLdpc ());
      capabilities.SetShortGuardIntervalFor80Mhz ((m_phy->GetChannelWidth () == 80) && m_phy->GetShortGuardInterval ());
      capabilities.SetShortGuardIntervalFor160Mhz ((m_phy->GetChannelWidth () == 160) && m_phy->GetShortGuardInterval ());
      uint32_t maxAmpduLength = std::max (std::max (m_beMaxAmpduSize, m_bkMaxAmpduSize), std::max (m_voMaxAmpduSize, m_viMaxAmpduSize));
      capabilities.SetMaxAmpduLengthExponent (uint8_t (std::max (7.0, std::ceil (std::log (maxAmpduLength + 1.0) - 13.0)))); //0 to 7 for VHT
      uint8_t maxMcs = 0;
      for (uint8_t i = 0; i < m_phy->GetNMcs (); i++)
        {

          gi |= 0x02;
        }
      capabilities.SetHeLtfAndGiForHePpdus (gi);
      uint32_t maxAmpduLength = std::max (std::max (m_beMaxAmpduSize, m_bkMaxAmpduSize), std::max (m_voMaxAmpduSize, m_viMaxAmpduSize));
      capabilities.SetMaxAmpduLengthExponent (uint8_t (std::max (7.0, std::ceil (std::log (maxAmpduLength + 1.0) - 13.0)))); //assume 0 to 7 for HE
      uint8_t maxMcs = 0;
      for (uint8_t i = 0; i < m_phy->GetNMcs (); i++)
        {

(-)a/src/wifi/model/vht-capabilities.cc (+5 lines)

Lines 49-54 VhtCapabilities::VhtCapabilities ()	Link Here

  m_rxMcsMap.resize (8,0);

  m_rxMcsMap.resize (8,0);

  m_txMcsMap.resize (8,0);

  m_txMcsMap.resize (8,0);

  for (uint8_t i = 0; i < 8; i++) //set to 3 by default, i.e. #spatial streams not supported. 0 means supported up to MCS 7, not what we want to imply at this stage.

      m_rxMcsMap[i] = 3;

      m_txMcsMap[i] = 3;

WifiInformationElementId

WifiInformationElementId

Return to bug 2739