Attachment #3110 for bug #2926

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

(-)a/src/wifi/model/minstrel-ht-wifi-manager.cc (-1 / +1 lines)

Lines 958-964	Link Here

958

959

960

bool

960

bool

961

MinstrelHtWifiManager::DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally)

961

MinstrelHtWifiManager::DoNeedRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally)

962

963

  NS_LOG_FUNCTION (this << st << packet << normally);

963

  NS_LOG_FUNCTION (this << st << packet << normally);

964

(-)a/src/wifi/model/minstrel-ht-wifi-manager.h (-1 / +1 lines)

Lines 241-247	Link Here

241

                              uint8_t nSuccessfulMpdus, uint8_t nFailedMpdus,

241

                              uint8_t nSuccessfulMpdus, uint8_t nFailedMpdus,

242

                              double rxSnr, double dataSnr);

242

                              double rxSnr, double dataSnr);

243

  bool IsLowLatency (void) const;

243

  bool IsLowLatency (void) const;

244

  bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

244

  bool DoNeedRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

245

246

/**

246

/**

247

   * Check the validity of a combination of number of streams, chWidth and mode.

247

   * Check the validity of a combination of number of streams, chWidth and mode.

(-)a/src/wifi/model/minstrel-wifi-manager.cc (-1 / +1 lines)

Lines 855-861	Link Here

855

856

857

bool

857

bool

858

MinstrelWifiManager::DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally)

858

MinstrelWifiManager::DoNeedRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally)

859

860

  NS_LOG_FUNCTION (this << st << packet << normally);

860

  NS_LOG_FUNCTION (this << st << packet << normally);

861

  MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *)st;

861

  MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *)st;

(-)a/src/wifi/model/minstrel-wifi-manager.h (-1 / +1 lines)

Lines 273-279	Link Here

273

  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

273

  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

274

  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

274

  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

275

276

  bool DoNeedDataRetransmission (WifiRemoteStation *st,

276

  bool DoNeedRetransmission (WifiRemoteStation *st,

277

                                 Ptr<const Packet> packet, bool normally);

277

                                 Ptr<const Packet> packet, bool normally);

278

279

  bool IsLowLatency (void) const;

279

  bool IsLowLatency (void) const;




Txop::NeedRtsRetransmission (Ptr<const Packet> packet, const WifiMacHeader &hdr)
{
  NS_LOG_FUNCTION (this);
  return m_stationManager->NeedRetransmission (hdr.GetAddr1 (), &hdr, packet);
}

bool
Txop::NeedDataRetransmission (Ptr<const Packet> packet, const WifiMacHeader &hdr)
{
  NS_LOG_FUNCTION (this);
  return m_stationManager->NeedRetransmission (hdr.GetAddr1 (), &hdr, packet);
}

bool




                   MakeBooleanAccessor (&WifiRemoteStationManager::IsLowLatency),
                   MakeBooleanChecker ())
    .AddAttribute ("MaxSsrc",
                   "The maximum number of retransmission attempts for any packet with size <= RtsCtsThreshold. "
                   "This value will not have any effect on some rate control algorithms.",
                   UintegerValue (7),
                   MakeUintegerAccessor (&WifiRemoteStationManager::SetMaxSsrc),
                   MakeUintegerChecker<uint32_t> ())
    .AddAttribute ("MaxSlrc",
                   "The maximum number of retransmission attempts for any packet with size > RtsCtsThreshold. "
                   "This value will not have any effect on some rate control algorithms.",
                   UintegerValue (4),
                   MakeUintegerAccessor (&WifiRemoteStationManager::SetMaxSlrc),

}

bool
WifiRemoteStationManager::NeedRetransmission (Mac48Address address, const WifiMacHeader *header,
                                                 Ptr<const Packet> packet)
{
  NS_LOG_FUNCTION (this << address << packet << *header);
  NS_ASSERT (!address.IsGroup ());
  WifiRemoteStation *station = Lookup (address, header);
  bool longMpdu = (packet->GetSize () + header->GetSize () + WIFI_MAC_FCS_LENGTH) > m_rtsCtsThreshold;
  uint32_t retryCount, maxRetryCount;
  if (longMpdu)
    {
      retryCount = station->m_slrc;
      maxRetryCount = m_maxSlrc;
    }
  else
    {
      retryCount = station->m_ssrc;
      maxRetryCount = m_maxSsrc;
    }
  bool normally = retryCount < maxRetryCount;
  NS_LOG_DEBUG ("WifiRemoteStationManager::NeedRetransmission count: " << retryCount << " result: " << std::boolalpha << normally);
  return DoNeedRetransmission (station, packet, normally);
}

bool

}

bool
WifiRemoteStationManager::DoNeedRetransmission (WifiRemoteStation *station,
                                                Ptr<const Packet> packet, bool normally)
{
  return normally;
}

bool
WifiRemoteStationManager::DoNeedDataRetransmission (WifiRemoteStation *station,
                                                    Ptr<const Packet> packet, bool normally)
{
  return normally;
}




                     double ackSnr, WifiMode ackMode, double dataSnr);
  /**
   * Should be invoked after calling ReportRtsFailed if
   * NeedRetransmission returns false
   *
   * \param address the address of the receiver
   * \param header MAC header of the DATA packet

  void ReportFinalRtsFailed (Mac48Address address, const WifiMacHeader *header);
  /**
   * Should be invoked after calling ReportDataFailed if
   * NeedRetransmission returns false
   *
   * \param address the address of the receiver
   * \param header MAC header of the DATA packet

   * \param header MAC header
   * \param packet the packet to send
   *
   * \return true if we want to restart a failed RTS/CTS handshake,
   *         false otherwise.
   */
  bool NeedRtsRetransmission (Mac48Address address, const WifiMacHeader *header,
                              Ptr<const Packet> packet);
  /**
   * \param address remote address
   * \param header MAC header
   * \param packet the packet to send
   *
   * \return true if we want to resend a packet after a failed transmission attempt,
   *         false otherwise.
   */
  bool NeedRetransmission (Mac48Address address, const WifiMacHeader *header,
                           Ptr<const Packet> packet);
  /**
   * \param address remote address
   * \param header MAC header

  /**
   * \param station the station that we need to communicate
   * \param packet the packet to send
   * \param normally indicates whether the normal 802.11 rts enable mechanism would
   *        request that the rts is retransmitted or not.
   *
   * \return true if we want to restart a failed RTS/CTS handshake,
   *         false otherwise.
   *
   * Note: This method is called after an rts/cts handshake has been attempted
   *       and has failed.
   */
  virtual bool DoNeedRtsRetransmission (WifiRemoteStation *station,
                                        Ptr<const Packet> packet, bool normally);
  /**
   * \param station the station that we need to communicate
   * \param packet the packet to send
   * \param normally indicates whether the normal 802.11 data retransmission mechanism
   *        would request that the data is retransmitted or not.
   * \return true if we want to resend a packet after a failed transmission attempt,
   *         false otherwise.
   *
   * Note: This method is called after any unicast packet transmission (control, management,
   *       or data) has been attempted and has failed.
   */
  virtual bool DoNeedRetransmission (WifiRemoteStation *station,
                                         Ptr<const Packet> packet, bool normally);
  /**
   * \param station the station that we need to communicate

Return to bug 2926