diff options
| author | weongyo <weongyo@FreeBSD.org> | 2009-06-03 04:10:22 +0000 |
|---|---|---|
| committer | weongyo <weongyo@FreeBSD.org> | 2009-06-03 04:10:22 +0000 |
| commit | 81faf87a47085ec201126dfc2517c052fd878b14 (patch) | |
| tree | f69972ebaf7e877276b9147dd87b2500800ad72a | |
| parent | fbef62df46e1f6848129dff9ea3b2edee6b2d693 (diff) | |
| download | FreeBSD-src-81faf87a47085ec201126dfc2517c052fd878b14.zip FreeBSD-src-81faf87a47085ec201126dfc2517c052fd878b14.tar.gz | |
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
| -rw-r--r-- | sys/net80211/ieee80211_scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index b41ed59..951e762 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) { |
