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

(-)a/src/wifi/model/minstrel-ht-wifi-manager.cc (-3 / +3 lines)
 Lines 1518-1532   MinstrelHtWifiManager::RateInit (MinstrelHtWifiRemoteStation *station) Link Here 
1518
        {
1518
        {
1519
          station->m_groupsTable[groupId].m_supported = false;
1519
          station->m_groupsTable[groupId].m_supported = false;
1520
          if (!(!GetVhtSupported (station) && m_minstrelGroups[groupId].isVht)                    ///Is VHT supported by the receiver?
1520
          if (!(!GetVhtSupported (station) && m_minstrelGroups[groupId].isVht)                    ///Is VHT supported by the receiver?
1521
              && (m_minstrelGroups[groupId].isVht || !GetVhtSupported (station) || !m_useVhtOnly) ///If it is an HT MCS, check if VHT only is disabled
1521
              && (m_minstrelGroups[groupId].isVht || !(GetVhtSupported (station) && GetNMcsSupported (station) > 1) || !m_useVhtOnly) ///If it is an HT MCS, check if VHT only is disabled
1522
              && !(!GetShortGuardInterval (station) && m_minstrelGroups[groupId].sgi)             ///Is SGI supported by the receiver?
1522
              && !(!GetShortGuardInterval (station) && m_minstrelGroups[groupId].sgi)             ///Is SGI supported by the receiver?
1523
              && (GetChannelWidth (station) >= m_minstrelGroups[groupId].chWidth)                 ///Is channel width supported by the receiver?
1523
              && (GetChannelWidth (station) >= m_minstrelGroups[groupId].chWidth)                 ///Is channel width supported by the receiver?
1524
              && (GetNumberOfSupportedStreams (station) >= m_minstrelGroups[groupId].streams))    ///Are streams supported by the receiver?
1524
              && (GetNumberOfSupportedStreams (station) >= m_minstrelGroups[groupId].streams))    ///Are streams supported by the receiver?
1525
            {
1525
            {
1526
              NS_LOG_DEBUG ("Group " << groupId << ": (" << (uint16_t)m_minstrelGroups[groupId].streams <<
1526
              NS_LOG_DEBUG ("Group " << groupId << ": (" << (uint16_t)m_minstrelGroups[groupId].streams <<
1527
                            "," << (uint16_t)m_minstrelGroups[groupId].sgi << "," << (uint16_t)m_minstrelGroups[groupId].chWidth << ")");
1527
                            "," << (uint16_t)m_minstrelGroups[groupId].sgi << "," << (uint16_t)m_minstrelGroups[groupId].chWidth << ")");
1528
1529
              station->m_groupsTable[groupId].m_supported = true;                                ///Group supported.
1530
              station->m_groupsTable[groupId].m_col = 0;
1528
              station->m_groupsTable[groupId].m_col = 0;
1531
              station->m_groupsTable[groupId].m_index = 0;
1529
              station->m_groupsTable[groupId].m_index = 0;
1532
1530
 Lines 1557-1562   MinstrelHtWifiManager::RateInit (MinstrelHtWifiRemoteStation *station) Link Here 
1557
                    {
1555
                    {
1558
                      NS_LOG_DEBUG ("Mode " << i << ": " << mode << " isVht: " << m_minstrelGroups[groupId].isVht);
1556
                      NS_LOG_DEBUG ("Mode " << i << ": " << mode << " isVht: " << m_minstrelGroups[groupId].isVht);
1559
1557
1558
                      station->m_groupsTable[groupId].m_supported = true;                                ///Group supported. Must be set here to ensure that if group is supported there is at least one MCS.
1559
1560
                      station->m_groupsTable[groupId].m_ratesTable[rateId].supported = true;
1560
                      station->m_groupsTable[groupId].m_ratesTable[rateId].supported = true;
1561
                      station->m_groupsTable[groupId].m_ratesTable[rateId].mcsIndex = i;         ///Mapping between rateId and operationalMcsSet
1561
                      station->m_groupsTable[groupId].m_ratesTable[rateId].mcsIndex = i;         ///Mapping between rateId and operationalMcsSet
1562
                      station->m_groupsTable[groupId].m_ratesTable[rateId].numRateAttempt = 0;
1562
                      station->m_groupsTable[groupId].m_ratesTable[rateId].numRateAttempt = 0;

Return to bug 2629