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

(-)a/examples/wireless/simple-ht-hidden-stations.cc (-2 lines)
 Lines 71-78    Link Here 
71
      Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
71
      Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
72
    }
72
    }
73
73
74
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
75
76
  //Set the maximum size for A-MPDU with regards to the payload size
74
  //Set the maximum size for A-MPDU with regards to the payload size
77
  maxAmpduSize = nMpdus * (payloadSize + 200);
75
  maxAmpduSize = nMpdus * (payloadSize + 200);
78
76
(-)a/src/wifi/model/edca-txop-n.cc (-3 / +14 lines)
 Lines 314-320    Link Here 
314
}
314
}
315
315
316
bool
316
bool
317
EdcaTxopN::GetBaAgreementExists (Mac48Address address, uint8_t tid)
317
EdcaTxopN::GetBaAgreementExists (Mac48Address address, uint8_t tid) const
318
{
318
{
319
  return m_baManager->ExistsAgreement (address, tid);
319
  return m_baManager->ExistsAgreement (address, tid);
320
}
320
}
 Lines 717-723    Link Here 
717
}
717
}
718
718
719
uint8_t
719
uint8_t
720
EdcaTxopN::GetCurrentTid ()
720
EdcaTxopN::GetCurrentTid () const
721
{
721
{
722
  NS_LOG_FUNCTION (this);
722
  NS_LOG_FUNCTION (this);
723
  if (m_currentHdr.IsQosData ())
723
  if (m_currentHdr.IsQosData ())
 Lines 1357-1362    Link Here 
1357
EdcaTxopN::NeedFragmentation (void) const
1357
EdcaTxopN::NeedFragmentation (void) const
1358
{
1358
{
1359
  NS_LOG_FUNCTION (this);
1359
  NS_LOG_FUNCTION (this);
1360
  if (m_stationManager->HasVhtSupported ()
1361
      || GetAmpduExist (m_currentHdr.GetAddr1 ())
1362
      || (m_stationManager->HasHtSupported ()
1363
      && m_currentHdr.IsQosData ()
1364
      && GetBaAgreementExists (m_currentHdr.GetAddr1 (), GetCurrentTid ())
1365
      && GetMpduAggregator ()->GetMaxAmpduSize () >= m_currentPacket->GetSize ()))
1366
    {
1367
      //MSDU is not fragmented when it is transmitted using an HT-immediate or
1368
      //HT-delayed Block Ack agreement or when it is carried in an A-MPDU.
1369
      return false;
1370
    }
1360
  return m_stationManager->NeedFragmentation (m_currentHdr.GetAddr1 (), &m_currentHdr,
1371
  return m_stationManager->NeedFragmentation (m_currentHdr.GetAddr1 (), &m_currentHdr,
1361
                                              m_currentPacket);
1372
                                              m_currentPacket);
1362
}
1373
}
 Lines 1543-1549    Link Here 
1543
    }
1554
    }
1544
}
1555
}
1545
1556
1546
bool EdcaTxopN::GetAmpduExist (Mac48Address dest)
1557
bool EdcaTxopN::GetAmpduExist (Mac48Address dest) const
1547
{
1558
{
1548
  NS_LOG_FUNCTION (this << dest);
1559
  NS_LOG_FUNCTION (this << dest);
1549
  if (m_aMpduEnabled.find (dest) != m_aMpduEnabled.end ())
1560
  if (m_aMpduEnabled.find (dest) != m_aMpduEnabled.end ())
(-)a/src/wifi/model/edca-txop-n.h (-3 / +3 lines)
 Lines 182-188    Link Here 
182
   * Checks if a block ack agreement exists with station addressed by
182
   * Checks if a block ack agreement exists with station addressed by
183
   * <i>recipient</i> for tid <i>tid</i>.
183
   * <i>recipient</i> for tid <i>tid</i>.
184
   */
184
   */
185
  bool GetBaAgreementExists (Mac48Address address, uint8_t tid);
185
  bool GetBaAgreementExists (Mac48Address address, uint8_t tid) const;
186
  /**
186
  /**
187
   * \param recipient address of peer station involved in block ack mechanism.
187
   * \param recipient address of peer station involved in block ack mechanism.
188
   * \param tid traffic ID.
188
   * \param tid traffic ID.
 Lines 424-430    Link Here 
424
  void SetBlockAckInactivityTimeout (uint16_t timeout);
424
  void SetBlockAckInactivityTimeout (uint16_t timeout);
425
  void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);
425
  void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);
426
  void CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp);
426
  void CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp);
427
  bool GetAmpduExist (Mac48Address dest);
427
  bool GetAmpduExist (Mac48Address dest) const;
428
  void SetAmpduExist (Mac48Address dest, bool enableAmpdu);
428
  void SetAmpduExist (Mac48Address dest, bool enableAmpdu);
429
429
430
  /**
430
  /**
 Lines 533-539    Link Here 
533
  /**
533
  /**
534
   * Get Traffic ID of the current packet.
534
   * Get Traffic ID of the current packet.
535
   */
535
   */
536
  uint8_t GetCurrentTid ();
536
  uint8_t GetCurrentTid () const;
537
  /*
537
  /*
538
   * Return the remaining duration in the current TXOP.
538
   * Return the remaining duration in the current TXOP.
539
   *
539
   *

Return to bug 2468