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

(-)a/src/wifi/model/edca-txop-n.cc (-1 / +1 lines)
 Lines 1646-1652    Link Here 
1646 
    }
 1646 
    }
1647 
  Mac48Address recipient = m_currentHdr.GetAddr1 ();
 1647 
  Mac48Address recipient = m_currentHdr.GetAddr1 ();
1648 
  uint32_t packets = m_queue->GetNPacketsByTidAndAddress (tid, WifiMacHeader::ADDR1, recipient);
 1648 
  uint32_t packets = m_queue->GetNPacketsByTidAndAddress (tid, WifiMacHeader::ADDR1, recipient);
1649 
  if ((m_blockAckThreshold > 0 && packets >= m_blockAckThreshold) || (packets > 1 && m_mpduAggregator != 0) || m_stationManager->HasVhtSupported ())
 1649 
  if ((m_blockAckThreshold > 0 && packets >= m_blockAckThreshold) || (m_mpduAggregator->GetSize() > 0 && packets > 1) || m_stationManager->HasVhtSupported ())
1650 
    {
 1650 
    {
1651 
      /* Block ack setup */
 1651 
      /* Block ack setup */
1652 
      uint16_t startingSequence = m_txMiddle->GetNextSeqNumberByTidAndAddress (tid, recipient);
 1652 
      uint16_t startingSequence = m_txMiddle->GetNextSeqNumberByTidAndAddress (tid, recipient);
(-)a/src/wifi/model/regular-wifi-mac.cc (-4 / +8 lines)
 Lines 996-1020    Link Here 
996 
                   MakeUintegerChecker<uint32_t> ())
 996 
                   MakeUintegerChecker<uint32_t> ())
997 
    .AddAttribute ("VO_BlockAckThreshold",
 997 
    .AddAttribute ("VO_BlockAckThreshold",
998 
                   "If number of packets in VO queue reaches this value, "
 998 
                   "If number of packets in VO queue reaches this value, "
999 
                   "block ack mechanism is used. If this value is 0, block ack is never used.",
 999 
                   "block ack mechanism is used. If this value is 0, block ack is never used."
1000 
                   "When A-MPDU is enabled, block ack mechanism is used regardless of this value.",
1000 
                   UintegerValue (0),
 1001 
                   UintegerValue (0),
1001 
                   MakeUintegerAccessor (&RegularWifiMac::SetVoBlockAckThreshold),
 1002 
                   MakeUintegerAccessor (&RegularWifiMac::SetVoBlockAckThreshold),
1002 
                   MakeUintegerChecker<uint8_t> (0, 64))
 1003 
                   MakeUintegerChecker<uint8_t> (0, 64))
1003 
    .AddAttribute ("VI_BlockAckThreshold",
 1004 
    .AddAttribute ("VI_BlockAckThreshold",
1004 
                   "If number of packets in VI queue reaches this value, "
 1005 
                   "If number of packets in VI queue reaches this value, "
1005 
                   "block ack mechanism is used. If this value is 0, block ack is never used.",
 1006 
                   "block ack mechanism is used. If this value is 0, block ack is never used."
1007 
                   "When A-MPDU is enabled, block ack mechanism is used regardless of this value.",
1006 
                   UintegerValue (0),
 1008 
                   UintegerValue (0),
1007 
                   MakeUintegerAccessor (&RegularWifiMac::SetViBlockAckThreshold),
 1009 
                   MakeUintegerAccessor (&RegularWifiMac::SetViBlockAckThreshold),
1008 
                   MakeUintegerChecker<uint8_t> (0, 64))
 1010 
                   MakeUintegerChecker<uint8_t> (0, 64))
1009 
    .AddAttribute ("BE_BlockAckThreshold",
 1011 
    .AddAttribute ("BE_BlockAckThreshold",
1010 
                   "If number of packets in BE queue reaches this value, "
 1012 
                   "If number of packets in BE queue reaches this value, "
1011 
                   "block ack mechanism is used. If this value is 0, block ack is never used.",
 1013 
                   "block ack mechanism is used. If this value is 0, block ack is never used."
1014 
                   "When A-MPDU is enabled, block ack mechanism is used regardless of this value.",
1012 
                   UintegerValue (0),
 1015 
                   UintegerValue (0),
1013 
                   MakeUintegerAccessor (&RegularWifiMac::SetBeBlockAckThreshold),
 1016 
                   MakeUintegerAccessor (&RegularWifiMac::SetBeBlockAckThreshold),
1014 
                   MakeUintegerChecker<uint8_t> (0, 64))
 1017 
                   MakeUintegerChecker<uint8_t> (0, 64))
1015 
    .AddAttribute ("BK_BlockAckThreshold",
 1018 
    .AddAttribute ("BK_BlockAckThreshold",
1016 
                   "If number of packets in BK queue reaches this value, "
 1019 
                   "If number of packets in BK queue reaches this value, "
1017 
                   "block ack mechanism is used. If this value is 0, block ack is never used.",
 1020 
                   "block ack mechanism is used. If this value is 0, block ack is never used."
1021 
                   "When A-MPDU is enabled, block ack mechanism is used regardless of this value.",
1018 
                   UintegerValue (0),
 1022 
                   UintegerValue (0),
1019 
                   MakeUintegerAccessor (&RegularWifiMac::SetBkBlockAckThreshold),
 1023 
                   MakeUintegerAccessor (&RegularWifiMac::SetBkBlockAckThreshold),
1020 
                   MakeUintegerChecker<uint8_t> (0, 64))
 1024 
                   MakeUintegerChecker<uint8_t> (0, 64))

Return to bug 2471