Module Name: src
Committed By: martin
Date: Tue Mar 2 08:30:40 UTC 2010
Modified Files:
src/sys/dev/mii: mii_physubr.c
Log Message:
Before destroying a autonegotiation callout, make sure it is quiet
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/mii/mii_physubr.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/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.67 src/sys/dev/mii/mii_physubr.c:1.68
--- src/sys/dev/mii/mii_physubr.c:1.67 Wed Feb 24 22:37:59 2010
+++ src/sys/dev/mii/mii_physubr.c Tue Mar 2 08:30:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.67 2010/02/24 22:37:59 dyoung Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.67 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -554,7 +554,7 @@
/* XXX Invalidate parent's media setting? */
if (sc->mii_flags & MIIF_DOINGAUTO)
- callout_stop(&sc->mii_nway_ch);
+ callout_halt(&sc->mii_nway_ch, NULL);
callout_destroy(&sc->mii_nway_ch);
