Attachment #2309 for bug #2313

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




MacLow::ResetPhy (void)
{
  m_phy->SetReceiveOkCallback (MakeNullCallback<void, Ptr<Packet>, double, WifiTxVector, enum WifiPreamble> ());
  m_phy->SetReceiveErrorCallback (MakeNullCallback<void, Ptr<Packet>, double, bool> ());
  RemovePhyMacLowListener (m_phy);
  m_phy = 0;
}

}

void
MacLow::ReceiveError (Ptr<Packet> packet, double rxSnr, bool isEndOfFrame)
{
  NS_LOG_FUNCTION (this << packet << rxSnr << isEndOfFrame);
  NS_LOG_DEBUG ("rx failed ");
  if (isEndOfFrame == true && m_receivedAtLeastOneMpdu == true)
    {
      WifiMacHeader hdr;
      MpduAggregator::DeaggregatedMpdus mpdu = MpduAggregator::Deaggregate (packet);
      mpdu.begin ()->first->PeekHeader (hdr);
      if (hdr.GetAddr1 () != m_self)
        {
          NS_LOG_DEBUG ("hdr addr1 " << hdr.GetAddr1 () << "not for me (" << m_self << "); returning");

              ampdutag.SetNoOfMpdus (queueSize);
            }
          newPacket->AddPacketTag (ampdutag);

          if (delay == Seconds (0))
            {
              if (!vhtSingleMpdu)

(-)a/src/wifi/model/mac-low.h (-1 / +1 lines)

Lines 732-738	Link Here

732

   * This method is typically invoked by the lower PHY layer to notify

732

   * This method is typically invoked by the lower PHY layer to notify

733

   * the MAC layer that a packet was unsuccessfully received.

733

   * the MAC layer that a packet was unsuccessfully received.

734

*/

734

*/

735

  void ReceiveError (Ptr<const Packet> packet, double rxSnr, bool isEndOfFrame);

735

  void ReceiveError (Ptr<Packet> packet, double rxSnr, bool isEndOfFrame);

736

/**

736

/**

737

   * \param duration switching delay duration.

737

   * \param duration switching delay duration.

738

(-)a/src/wifi/model/wifi-phy-state-helper.cc (-1 / +1 lines)

Lines 442-448	Link Here

442

443

444

void

444

void

445

WifiPhyStateHelper::SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame)

445

WifiPhyStateHelper::SwitchFromRxEndError (Ptr<Packet> packet, double snr, bool isEndOfFrame)

446

447

  m_rxErrorTrace (packet, snr);

447

  m_rxErrorTrace (packet, snr);

448

  NotifyRxEndError ();

448

  NotifyRxEndError ();

(-)a/src/wifi/model/wifi-phy-state-helper.h (-1 / +1 lines)

Lines 169-175	Link Here

169

   * \param snr the SNR of the received packet

169

   * \param snr the SNR of the received packet

170

   * \param isEndOfFrame PHY-RXEND indication.

170

   * \param isEndOfFrame PHY-RXEND indication.

171

*/

171

*/

172

  void SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame);

172

  void SwitchFromRxEndError (Ptr<Packet> packet, double snr, bool isEndOfFrame);

173

/**

173

/**

174

   * Switch to CCA busy.

174

   * Switch to CCA busy.

175

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

Lines 194-200	Link Here

194

   * arg2: snr of packet

194

   * arg2: snr of packet

195

   * arg3: PHY-RXEND flag

195

   * arg3: PHY-RXEND flag

196

*/

196

*/

197

  typedef Callback<void, Ptr<const Packet>, double, bool> RxErrorCallback;

197

  typedef Callback<void, Ptr<Packet>, double, bool> RxErrorCallback;

198

199

  static TypeId GetTypeId (void);

199

  static TypeId GetTypeId (void);

200

Return to bug 2313