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

--- a/src/devices/wifi/nqsta-wifi-mac.h	Fri Jun 26 10:56:59 2009 +0200
+++ b/src/devices/wifi/nqsta-wifi-mac.h	Fri Jun 26 12:57:29 2009 +0200
@@ -130,7 +130,8 @@
   void TryToEnsureAssociated (void);
   void AssocRequestTimeout (void);
   void ProbeRequestTimeout (void);
-  bool IsAssociated (void);
+  bool IsAssociated (void) const;
+  bool IsWaitAssocResp (void) const;
   void MissedBeacons (void);
   void RestartBeaconWatchdog (Time delay);
   SupportedRates GetSupportedRates (void) const;

--- 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;
         }

--- a/src/devices/wifi/qsta-wifi-mac.h	Fri Jun 26 10:56:59 2009 +0200
+++ b/src/devices/wifi/qsta-wifi-mac.h	Fri Jun 26 12:57:29 2009 +0200
@@ -101,7 +101,8 @@
   void SendAssociationRequest (void);
   void SendProbeRequest (void);
   void TryToEnsureAssociated (void);
-  bool IsAssociated (void);
+  bool IsAssociated (void) const;
+  bool IsWaitAssocResp (void) const;
   virtual void DoDispose (void);
 
  /**