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

(-)a/src/wifi/model/edca-txop-n.cc (-6 / +1 lines)
 Lines 416-427   void EdcaTxopN::NotifyInternalCollision (void) Link Here 
416
          else
416
          else
417
            {
417
            {
418
              NS_LOG_DEBUG ("Dequeueing and discarding head of queue");
418
              NS_LOG_DEBUG ("Dequeueing and discarding head of queue");
419
              Ptr<const WifiMacQueueItem> item = m_queue->Peek ();
419
              m_queue->Remove ();
420
              if (item)
421
                {
422
                  packet = item->GetPacket ();
423
                  header = item->GetHeader ();
424
                }
425
            }
420
            }
426
          m_dcf->ResetCw ();
421
          m_dcf->ResetCw ();
427
        }
422
        }
(-)a/src/wifi/model/wifi-mac-queue.cc (-9 / +5 lines)
 Lines 330-344   WifiMacQueue::Remove (void) Link Here 
330
{
330
{
331
  NS_LOG_FUNCTION (this);
331
  NS_LOG_FUNCTION (this);
332
332
333
  for (auto it = Head (); it != Tail (); )
333
  Ptr<WifiMacQueueItem> item = DoRemove (Head ());
334
    {
334
335
      if (!TtlExceeded (it))
335
  for (auto it = Head (); it != Tail () && TtlExceeded (it); );
336
        {
336
337
          return DoRemove (it);
337
  return item;
338
        }
339
    }
340
  NS_LOG_DEBUG ("The queue is empty");
341
  return 0;
342
}
338
}
343
339
344
template<>
340
template<>

Return to bug 2621