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

(-)a/src/wifi/model/regular-wifi-mac.cc (-2 / +2 lines)
 Lines 145-153    Link Here 
145
  if (m_htSupported)
145
  if (m_htSupported)
146
    {
146
    {
147
      capabilities.SetLdpc (m_phy->GetLdpc ());
147
      capabilities.SetLdpc (m_phy->GetLdpc ());
148
      capabilities.SetSupportedChannelWidth (m_phy->GetChannelWidth () == 40);
148
      capabilities.SetSupportedChannelWidth (m_phy->GetChannelWidth () >= 40);
149
      capabilities.SetShortGuardInterval20 (m_phy->GetGuardInterval ());
149
      capabilities.SetShortGuardInterval20 (m_phy->GetGuardInterval ());
150
      capabilities.SetShortGuardInterval40 (m_phy->GetChannelWidth () == 40 && m_phy->GetGuardInterval ());
150
      capabilities.SetShortGuardInterval40 (m_phy->GetChannelWidth () >= 40 && m_phy->GetGuardInterval ());
151
      capabilities.SetGreenfield (m_phy->GetGreenfield ());
151
      capabilities.SetGreenfield (m_phy->GetGreenfield ());
152
      capabilities.SetMaxAmsduLength (1); //hardcoded for now (TBD)
152
      capabilities.SetMaxAmsduLength (1); //hardcoded for now (TBD)
153
      capabilities.SetLSigProtectionSupport (!m_phy->GetGreenfield ());
153
      capabilities.SetLSigProtectionSupport (!m_phy->GetGreenfield ());
(-)a/src/wifi/model/wifi-mode.cc (-14 / +32 lines)
 Lines 190-210    Link Here 
190
          symbolRate = (1 / 3.6) * 1e6;
190
          symbolRate = (1 / 3.6) * 1e6;
191
        }
191
        }
192
192
193
      switch (channelWidth)
193
      if (item->modClass == WIFI_MOD_CLASS_HT)
194
        {
194
        {
195
        case 20:
195
          switch (channelWidth)
196
        default:
196
            {
197
          usableSubCarriers = 52;
197
            case 20:
198
          break;
198
            default:
199
        case 40:
199
              usableSubCarriers = 52;
200
          usableSubCarriers = 108;
200
              break;
201
          break;
201
            case 40:
202
        case 80:
202
            case 80:
203
          usableSubCarriers = 234;
203
            case 160:
204
          break;
204
              usableSubCarriers = 108;
205
        case 160:
205
              break;
206
          usableSubCarriers = 468;
206
            }
207
          break;
207
        }
208
      else //WIFI_MOD_CLASS_VHT
209
        {
210
          switch (channelWidth)
211
            {
212
            case 20:
213
            default:
214
              usableSubCarriers = 52;
215
              break;
216
            case 40:
217
              usableSubCarriers = 108;
218
              break;
219
            case 80:
220
              usableSubCarriers = 234;
221
              break;
222
            case 160:
223
              usableSubCarriers = 468;
224
              break;
225
            }
208
        }
226
        }
209
227
210
      switch (GetCodeRate ())
228
      switch (GetCodeRate ())

Return to bug 2601