--- a/src/devices/wifi/mac-high-nqsta.h	Wed Oct 10 16:04:25 2007 +0200
+++ b/src/devices/wifi/mac-high-nqsta.h	Thu Oct 11 10:47:01 2007 +0200
@@ -75,6 +75,7 @@
   bool IsAssociated (void);
   SupportedRates GetSupportedRates (void);
   void MissedBeacons (void);
+  void RestartBeaconWatchdog (Time delay);
   enum {
     ASSOCIATED,
     WAIT_PROBE_RESP,
@@ -92,7 +93,8 @@
   DisAssociatedCallback m_disAssociatedCallback;
   SupportedRates m_rates;
   DcaTxop *m_dca;
-  Watchdog *m_beaconWatchdog;
+  EventId m_beaconWatchdog;
+  Time m_beaconWatchdogEnd;
   Mac48Address m_bssid;
   uint32_t m_maxMissedBeacons;
 };