Module Name: src
Committed By: jdc
Date: Mon Feb 4 18:29:56 UTC 2013
Modified Files:
src/sys/dev/ic: gem.c
Log Message:
Halt the RX watchdog callout when stopping.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ic/gem.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/gem.c
diff -u src/sys/dev/ic/gem.c:1.100 src/sys/dev/ic/gem.c:1.101
--- src/sys/dev/ic/gem.c:1.100 Sun Jul 22 14:32:57 2012
+++ src/sys/dev/ic/gem.c Mon Feb 4 18:29:55 2013
@@ -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 @@ gem_stop(struct ifnet *ifp, int disable)
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
