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

(-)a/src/wifi/model/sta-wifi-mac.cc (+12 lines)
 Lines 183-188    Link Here 
183
  // association or not.
183
  // association or not.
184
  m_dca->Queue (packet, hdr);
184
  m_dca->Queue (packet, hdr);
185
185
186
  if (m_assocRequestEvent.IsRunning ())
187
    {
188
      m_assocRequestEvent.Cancel ();
189
    }
186
  m_probeRequestEvent = Simulator::Schedule (m_probeRequestTimeout,
190
  m_probeRequestEvent = Simulator::Schedule (m_probeRequestTimeout,
187
                                             &StaWifiMac::ProbeRequestTimeout, this);
191
                                             &StaWifiMac::ProbeRequestTimeout, this);
188
}
192
}
 Lines 216-221    Link Here 
216
  // association or not.
220
  // association or not.
217
  m_dca->Queue (packet, hdr);
221
  m_dca->Queue (packet, hdr);
218
222
223
  if (m_assocRequestEvent.IsRunning ())
224
    {
225
      m_assocRequestEvent.Cancel ();
226
    }
219
  m_assocRequestEvent = Simulator::Schedule (m_assocRequestTimeout,
227
  m_assocRequestEvent = Simulator::Schedule (m_assocRequestTimeout,
220
                                             &StaWifiMac::AssocRequestTimeout, this);
228
                                             &StaWifiMac::AssocRequestTimeout, this);
221
}
229
}
 Lines 283-288    Link Here 
283
  NS_LOG_FUNCTION (this);
291
  NS_LOG_FUNCTION (this);
284
  if (m_beaconWatchdogEnd > Simulator::Now ())
292
  if (m_beaconWatchdogEnd > Simulator::Now ())
285
    {
293
    {
294
      if (m_beaconWatchdog.IsRunning ())
295
        {
296
          m_beaconWatchdog.Cancel ();
297
        }
286
      m_beaconWatchdog = Simulator::Schedule (m_beaconWatchdogEnd - Simulator::Now (),
298
      m_beaconWatchdog = Simulator::Schedule (m_beaconWatchdogEnd - Simulator::Now (),
287
                                              &StaWifiMac::MissedBeacons, this);
299
                                              &StaWifiMac::MissedBeacons, this);
288
      return;
300
      return;

Return to bug 1584