summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2015-11-17 12:30:43 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2015-11-17 12:30:43 +0000
commit5f79210ade8c17c34e3229c9f7fbd2f4d02b7865 (patch)
tree8ef5714867cff7b84db9f53b4f64c51b2c4fdf62 /sys
parent2293a9c6f0bb38464633bd36e126258893fc64c7 (diff)
Clear if_timer when shutting down the interface so the watchdog timer
doesn't fire a few seconds later. problem reported by Hrvoje Popovski, ok dlg@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_bge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 7d728624c41..7a2ef165601 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bge.c,v 1.375 2015/11/17 01:47:08 dlg Exp $ */
+/* $OpenBSD: if_bge.c,v 1.376 2015/11/17 12:30:42 jmatthew Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -4553,6 +4553,7 @@ bge_stop(struct bge_softc *sc)
timeout_del(&sc->bge_rxtimeout_jumbo);
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_timer = 0;
/*
* Tell firmware we're shutting down.