Module Name: src
Committed By: jakllsch
Date: Fri Dec 14 21:23:44 UTC 2018
Modified Files:
src/sys/dev/ic: malo.c
Log Message:
use callout_destroy in malo_detach, not callout_stop
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/malo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/malo.c
diff -u src/sys/dev/ic/malo.c:1.14 src/sys/dev/ic/malo.c:1.15
--- src/sys/dev/ic/malo.c:1.14 Fri Dec 14 20:44:36 2018
+++ src/sys/dev/ic/malo.c Fri Dec 14 21:23:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: malo.c,v 1.14 2018/12/14 20:44:36 jakllsch Exp $ */
+/* $NetBSD: malo.c,v 1.15 2018/12/14 21:23:43 jakllsch Exp $ */
/* $OpenBSD: malo.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.14 2018/12/14 20:44:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.15 2018/12/14 21:23:43 jakllsch Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -470,10 +470,9 @@ malo_detach(void *arg)
struct ieee80211com *ic = &sc->sc_ic;
struct ifnet *ifp = &sc->sc_if;
- /* remove channel scanning timer */
- callout_stop(&sc->sc_scan_to);
-
malo_stop(ifp, 1);
+ /* remove channel scanning timer */
+ callout_destroy(&sc->sc_scan_to);
ieee80211_ifdetach(ic);
if_detach(ifp);
malo_free_cmd(sc);
