diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-11-21 02:42:28 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-11-21 02:42:28 +0000 |
| commit | ec83e3fb9350bf3ecdd634f6ae03a2e677775a73 (patch) | |
| tree | 722994196ccd9ccef70cbb1f548d066b5b38e23c /sys/dev | |
| parent | e7c764e47529e720f7ff918ad65cb307536a8d85 (diff) | |
Remove watchdog handler workaround introduced in rev 1.149 which is no
longer necessary.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_em.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index a937f93686e..0530713d18d 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.159 2006/11/21 02:30:37 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.160 2006/11/21 02:42:27 brad Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -595,14 +595,6 @@ em_watchdog(struct ifnet *ifp) return; } - /* - * Reclaim first as there is a possibility of losing Tx completion - * interrupts. - */ - em_txeof(sc); - if (sc->num_tx_desc_avail == sc->num_tx_desc) - return; - printf("%s: watchdog timeout -- resetting\n", sc->sc_dv.dv_xname); em_init(sc); |