From 9e8ef1a77bba033dec1137b80dfefc1d59cdc9c5 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 2 Mar 2010 08:30:40 +0000 Subject: Before destroying a autonegotiation callout, make sure it is quiet --- sys/dev/mii/mii_physubr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index d83ee49fa67..81ffb21e1c7 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -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 -__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 #include @@ -554,7 +554,7 @@ mii_phy_detach(device_t self, int flags) /* 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); -- cgit