diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-11-28 11:12:46 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-11-28 11:12:46 +0000 |
| commit | ae245da0445107d49b44888c87cc148a3f0dd5c8 (patch) | |
| tree | 7aceee5da24cc15500f1478c3691519316cfd199 /sys/netinet/ip_input.c | |
| parent | bee61d12ee3ec8711d987caada93af70892957f9 (diff) | |
Assert that every slow/fast timeout routine is called at IPL_SOFTNET.
This removes multipe recursive splsoftnet()/splx() dances.
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 86dfce0d7d5..d96a77786cc 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.286 2016/11/23 10:04:31 mpi Exp $ */ +/* $OpenBSD: ip_input.c,v 1.287 2016/11/28 11:12:45 mpi Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -978,7 +978,8 @@ void ip_slowtimo(void) { struct ipq *fp, *nfp; - int s = splsoftnet(); + + splsoftassert(IPL_SOFTNET); for (fp = LIST_FIRST(&ipq); fp != NULL; fp = nfp) { nfp = LIST_NEXT(fp, ipq_q); @@ -987,7 +988,6 @@ ip_slowtimo(void) ip_freef(fp); } } - splx(s); } /* |