Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Halt the RX watchdog callout when stopping.



details:   https://anonhg.NetBSD.org/src/rev/8fe3fbee33d7
branches:  trunk
changeset: 784636:8fe3fbee33d7
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon Feb 04 18:29:55 2013 +0000

description:
Halt the RX watchdog callout when stopping.

diffstat:

 sys/dev/ic/gem.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r cb5966166f7d -r 8fe3fbee33d7 sys/dev/ic/gem.c
--- a/sys/dev/ic/gem.c  Mon Feb 04 17:19:17 2013 +0000
+++ b/sys/dev/ic/gem.c  Mon Feb 04 18:29:55 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gem.c,v 1.100 2012/07/22 14:32:57 matt Exp $ */
+/*     $NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.100 2012/07/22 14:32:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $");
 
 #include "opt_inet.h"
 
@@ -713,6 +713,7 @@
        DPRINTF(sc, ("%s: gem_stop\n", device_xname(sc->sc_dev)));
 
        callout_halt(&sc->sc_tick_ch, NULL);
+       callout_halt(&sc->sc_rx_watchdog, NULL);
        if ((sc->sc_flags & (GEM_SERDES | GEM_SERIAL)) != 0)
                gem_pcs_stop(sc, disable);
        else



Home | Main Index | Thread Index | Old Index