svn commit: r193366 - head/sys/net80211

[Weongyo Jeong]

Author: weongyo
Date: Wed Jun  3 04:10:22 2009
New Revision: 193366
URL: http://svn.freebsd.org/changeset/base/193366

Log:
  calls callout_drain(9) to un-schedule a scan timer to prevent a page
  fault in softclock.
  
  Submitted by:	sam
  Reviewed by:	jhb, sam (original version), thompsa

Modified:
  head/sys/net80211/ieee80211_scan.c

Modified: head/sys/net80211/ieee80211_scan.c
==============================================================================
--- head/sys/net80211/ieee80211_scan.c	Wed Jun  3 03:42:00 2009	(r193365)
+++ head/sys/net80211/ieee80211_scan.c	Wed Jun  3 04:10:22 2009	(r193366)
@@ -131,6 +131,7 @@ ieee80211_scan_detach(struct ieee80211co
 		scan_signal(ss);
 		IEEE80211_UNLOCK(ic);
 		ieee80211_draintask(ic, &SCAN_PRIVATE(ss)->ss_scan_task);
+		callout_drain(&SCAN_PRIVATE(ss)->ss_scan_timer);
 		KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0,
 		    ("scan still running"));
 		if (ss->ss_ops != NULL) {