From 92edaed1a7a96a6d7dcd3a888cd33d4d1f6fdebe Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Mon, 19 Jul 2004 21:14:18 +0000
Subject: Delete the AP scan timeout in atw_detach.  Fixes a panic on detach if
 the timeout is still active as seen by david@

---
 sys/dev/ic/atw.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sys/dev')

diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 129645cf437..c41e97b7088 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.21 2004/07/15 16:21:13 millert Exp $	*/
+/*	$OpenBSD: atw.c,v 1.22 2004/07/19 21:14:17 millert Exp $	*/
 /*	$NetBSD: atw.c,v 1.65 2004/07/15 07:31:05 dyoung Exp $	*/
 
 /*-
@@ -2673,6 +2673,8 @@ atw_detach(struct atw_softc *sc)
 	if ((sc->sc_flags & ATWF_ATTACHED) == 0)
 		return (0);
 
+	timeout_del(&sc->sc_scan_to);
+
 	ieee80211_ifdetach(ifp);
 	if_detach(ifp);
 
-- 
cgit v1.2.3