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

(-)a/src/devices/wifi/nqsta-wifi-mac.cc (-4 / +7 lines)
 Lines 303-310    Link Here 
303 
void
303 
void
304 
NqstaWifiMac::ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to)
 304 
NqstaWifiMac::ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to)
305 
{
 305 
{
306 
  NS_LOG_FUNCTION (this << packet << from << to);
 306 
  NS_LOG_FUNCTION (this << GetAddress () << *packet << from << to);
307 
  m_forwardUp (packet, from, to);
 307 
  if (from != GetAddress ())
308 
    {
309 
      m_forwardUp (packet, from, to);
310 
    }
308 
}
 311 
}
309 
void
 312 
void
310 
NqstaWifiMac::SendProbeRequest (void)
 313 
NqstaWifiMac::SendProbeRequest (void)
 Lines 445-451    Link Here 
445 
void
448 
void
446 
NqstaWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to)
 449 
NqstaWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to)
447 
{
 450 
{
448 
  NS_LOG_FUNCTION (this << packet << to);
 451 
  NS_LOG_FUNCTION (this << GetAddress () << *packet << to);
449 
  if (!IsAssociated ())
452 
  if (!IsAssociated ())
450 
    {
 453 
    {
451 
      TryToEnsureAssociated ();
 454 
      TryToEnsureAssociated ();
 Lines 480-486    Link Here 
480 
    }
483 
    }
481 
  else if (hdr->IsData ())
484 
  else if (hdr->IsData ())
482 
    {
 485 
    {
483 
      ForwardUp (packet, hdr->GetAddr2 (), hdr->GetAddr1 ());
 486 
      ForwardUp (packet, hdr->GetAddr3 (), hdr->GetAddr1 ());
484 
    }
487 
    }
485 
  else if (hdr->IsProbeReq () ||
 488 
  else if (hdr->IsProbeReq () ||
486 
           hdr->IsAssocReq ())
489 
           hdr->IsAssocReq ())

Return to bug 352