--- a/src/devices/wifi/qsta-wifi-mac.cc	Fri Jun 26 10:56:59 2009 +0200
+++ b/src/devices/wifi/qsta-wifi-mac.cc	Fri Jun 26 12:57:29 2009 +0200
@@ -484,9 +484,15 @@
 }
 
 bool
-QstaWifiMac::IsAssociated ()
+QstaWifiMac::IsAssociated (void) const
 {
-  return (m_state == ASSOCIATED)?true:false;
+  return m_state == ASSOCIATED;
+}
+
+bool 
+QstaWifiMac::IsWaitAssocResp (void) const
+{
+  return m_state == WAIT_ASSOC_RESP;
 }
 
 void
@@ -593,7 +599,7 @@
         {
           goodBeacon = true;
         }
-      if (IsAssociated () && hdr->GetAddr3 () != GetBssid ())
+      if ((IsWaitAssocResp () || IsAssociated ()) && hdr->GetAddr3 () != GetBssid ())
         {
           goodBeacon = false;
         }