From ae245da0445107d49b44888c87cc148a3f0dd5c8 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Mon, 28 Nov 2016 11:12:46 +0000
Subject: Assert that every slow/fast timeout routine is called at IPL_SOFTNET.

This removes multipe recursive splsoftnet()/splx() dances.
---
 sys/netinet/tcp_timer.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'sys/netinet/tcp_timer.c')

diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 698cb0bb0c9..661fe0c8b6d 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.c,v 1.51 2016/11/07 09:08:06 mpi Exp $	*/
+/*	$OpenBSD: tcp_timer.c,v 1.52 2016/11/28 11:12:45 mpi Exp $	*/
 /*	$NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $	*/
 
 /*
@@ -129,13 +129,11 @@ tcp_delack(void *arg)
 void
 tcp_slowtimo(void)
 {
-	int s;
+	splsoftassert(IPL_SOFTNET);
 
-	s = splsoftnet();
 	tcp_maxidle = TCPTV_KEEPCNT * tcp_keepintvl;
 	tcp_iss += TCP_ISSINCR2/PR_SLOWHZ;		/* increment iss */
 	tcp_now++;					/* for timestamps */
-	splx(s);
 }
 
 /*
-- 
cgit v1.2.3