summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Wooding <kjell@cvs.openbsd.org>1999-12-28 09:43:34 +0000
committerKjell Wooding <kjell@cvs.openbsd.org>1999-12-28 09:43:34 +0000
commit2c5bbd2c239c173a21bd87ffed799f043b98a38d (patch)
treea22041c4e0ffd606e2e6a1298667b11f092c3450
parentd775fd37a1e97c41c4110033f41888bcf74271db (diff)
Avoid recursive rw_enter panic. From darrenr@pobox.com.
-rw-r--r--sys/netinet/ip_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index f3e6a05733d..2233e604a76 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_state.c,v 1.16 1999/12/28 08:20:40 kjell Exp $ */
+/* $OpenBSD: ip_state.c,v 1.17 1999/12/28 09:43:33 kjell Exp $ */
/*
* Copyright (C) 1995-1998 by Darren Reed.
*
@@ -8,7 +8,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.16 1999/12/28 08:20:40 kjell Exp $";
+static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.17 1999/12/28 09:43:33 kjell Exp $";
#endif
#include <sys/errno.h>
@@ -1039,11 +1039,11 @@ void fr_timeoutstate()
ips_num--;
} else
isp = &is->is_next;
+ RWLOCK_EXIT(&ipf_state);
if (fr_state_doflush) {
(void) fr_state_flush(1);
fr_state_doflush = 0;
}
- RWLOCK_EXIT(&ipf_state);
SPL_X(s);
}