From 38812f8ee660434d1b2b3196bf5c076506454060 Mon Sep 17 00:00:00 2001
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Wed, 3 Jun 2009 04:10:22 +0000
Subject: [PATCH] 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
---
 sys/net80211/ieee80211_scan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
index b41ed59a2131..951e7623aea4 100644
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -131,6 +131,7 @@ ieee80211_scan_detach(struct ieee80211com *ic)
 		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) {