summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2011-10-31 22:02:52 +0000
committermikeb <mikeb@openbsd.org>2011-10-31 22:02:52 +0000
commitf71f45bb02dc1faeca35a4b89dbf5791bcbae7d2 (patch)
treeea7ee39b546bba7eaa7f2f93ec23b04924373afd
parentSave and restore MSI configuration on PCI-Express bridges during (diff)
downloadwireguard-openbsd-f71f45bb02dc1faeca35a4b89dbf5791bcbae7d2.tar.xz
wireguard-openbsd-f71f45bb02dc1faeca35a4b89dbf5791bcbae7d2.zip
Don't forget to cancel bulk update failure timeout when destroying an
interface. Problem report and fix from Erik Lax, thanks!
-rw-r--r--sys/net/if_pfsync.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 1a255947cf6..2cf574f0556 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.170 2011/10/30 23:04:38 mikeb Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.171 2011/10/31 22:02:52 mikeb Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -347,6 +347,7 @@ pfsync_clone_destroy(struct ifnet *ifp)
struct pfsync_deferral *pd;
int s;
+ timeout_del(&sc->sc_bulkfail_tmo);
timeout_del(&sc->sc_bulk_tmo);
timeout_del(&sc->sc_tmo);
#if NCARP > 0