Attachment #2420 for bug #2406

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

(-)a/src/wave/model/ocb-wifi-mac.cc (-2 / +28 lines)

Lines 160-167	Link Here

160

  NS_LOG_FUNCTION (this << packet << to);

160

  NS_LOG_FUNCTION (this << packet << to);

161

  if (m_stationManager->IsBrandNew (to))

161

  if (m_stationManager->IsBrandNew (to))

162

163

      // In ocb mode, we assume that every destination supports all

163

      //In ad hoc mode, we assume that every destination supports all

164

      // the rates we support.

164

      //the rates we support.

165

      if (m_htSupported || m_vhtSupported)

166

167

          m_stationManager->AddAllSupportedMcs (to);

168

          m_stationManager->AddStationHtCapabilities (to, GetHtCapabilities());

169

170

      if (m_vhtSupported)

171

172

          m_stationManager->AddStationVhtCapabilities (to, GetVhtCapabilities());

173

165

      m_stationManager->AddAllSupportedModes (to);

174

      m_stationManager->AddAllSupportedModes (to);

166

      m_stationManager->RecordDisassociated (to);

175

      m_stationManager->RecordDisassociated (to);

167

176

Lines 237-242	Link Here

237

  Mac48Address from = hdr->GetAddr2 ();

246

  Mac48Address from = hdr->GetAddr2 ();

238

  Mac48Address to = hdr->GetAddr1 ();

247

  Mac48Address to = hdr->GetAddr1 ();

239

248

249

  if (m_stationManager->IsBrandNew (from))

250

251

      //In ad hoc mode, we assume that every destination supports all

252

      //the rates we support.

253

      if (m_htSupported || m_vhtSupported)

254

255

          m_stationManager->AddAllSupportedMcs (from);

256

          m_stationManager->AddStationHtCapabilities (from, GetHtCapabilities());

257

258

      if (m_vhtSupported)

259

260

          m_stationManager->AddStationVhtCapabilities (from, GetVhtCapabilities());

261

262

      m_stationManager->AddAllSupportedModes (from);

263

      m_stationManager->RecordDisassociated (from);

264

265

240

  if (hdr->IsData ())

266

  if (hdr->IsData ())

241

267

242

      if (hdr->IsQosData () && hdr->IsQosAmsdu ())

268

      if (hdr->IsQosData () && hdr->IsQosAmsdu ())




  NS_ASSERT (!hdr->IsCtl ());
  Mac48Address from = hdr->GetAddr2 ();
  Mac48Address to = hdr->GetAddr1 ();
  if (m_stationManager->IsBrandNew (from))
    {
      //In ad hoc mode, we assume that every destination supports all
      //the rates we support.
      if (m_htSupported || m_vhtSupported)
        {
          m_stationManager->AddAllSupportedMcs (from);
          m_stationManager->AddStationHtCapabilities (from, GetHtCapabilities());
        }
      if (m_vhtSupported)
        {
          m_stationManager->AddStationVhtCapabilities (from, GetVhtCapabilities());
        }
      m_stationManager->AddAllSupportedModes (from);
      m_stationManager->RecordDisassociated (from);
    }
  if (hdr->IsData ())
    {
      if (hdr->IsQosData () && hdr->IsQosAmsdu ())




void
WifiRemoteStationManager::AddAllSupportedModes (Mac48Address address)
{
  NS_LOG_FUNCTION (this << address);
  NS_ASSERT (!address.IsGroup ());
  WifiRemoteStationState *state = LookupState (address);
  state->m_operationalRateSet.clear ();
  for (uint32_t i = 0; i < m_wifiPhy->GetNModes (); i++)
    {
      state->m_operationalRateSet.push_back (m_wifiPhy->GetMode (i));
      if (m_wifiPhy->GetMode (i).IsMandatory ())
        {
          AddBasicMode (m_wifiPhy->GetMode (i));
        }
    }
}

void
WifiRemoteStationManager::AddAllSupportedMcs (Mac48Address address)
{
  NS_LOG_FUNCTION (this << address);
  NS_ASSERT (!address.IsGroup ());
  WifiRemoteStationState *state = LookupState (address);
  state->m_operationalMcsSet.clear ();

Return to bug 2406