--- a/src/devices/wifi/nqsta-wifi-mac.cc	Sun Jan 11 23:26:34 2009 +0000
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Mon Jan 12 13:35:41 2009 +0100
@@ -475,8 +475,12 @@
 {
   NS_LOG_FUNCTION (this << packet << hdr);
   NS_ASSERT (!hdr->IsCtl ());
-  if (hdr->GetAddr1 () != GetAddress () &&
-      !hdr->GetAddr1 ().IsBroadcast ()) 
+  if (hdr->GetAddr3 () == GetAddress ())
+    {
+      NS_LOG_LOGIC ("packet sent by us.");
+    }
+  else if (hdr->GetAddr1 () != GetAddress () &&
+           !hdr->GetAddr1 ().IsGroup ()) 
     {
       NS_LOG_LOGIC ("packet is not for us");
     } 
@@ -497,10 +501,7 @@
           NS_LOG_LOGIC ("Received data frame not from the the BSS we are associated with: ignore");
           return;
         }
-      if (hdr->GetAddr3 () != GetAddress ())
-        {
-          ForwardUp (packet, hdr->GetAddr3 (), hdr->GetAddr1 ());
-        }
+      ForwardUp (packet, hdr->GetAddr3 (), hdr->GetAddr1 ());
     } 
   else if (hdr->IsProbeReq () ||
            hdr->IsAssocReq ())