diff options
| author |   bluhm <bluhm@openbsd.org> | 2013-06-01 13:25:40 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2013-06-01 13:25:40 +0000 |
| commit | 936cb8acbf55ab123a0e64b7c4e5c6d2d7c00923 (patch) | |
| tree | 3c5ef8dedf75689bdc545291eb1b6545314ef060 | |
| parent | Use clock_gettime(CLOCK_MONOTONIC ...) for ssh timers so that things like (diff) | |
| download | wireguard-openbsd-936cb8acbf55ab123a0e64b7c4e5c6d2d7c00923.tar.xz wireguard-openbsd-936cb8acbf55ab123a0e64b7c4e5c6d2d7c00923.zip | |
Remove redundant call to splsoftnet(). There is a
splsoftassert(IPL_SOFTNET) at the start of in_pcbdetach().
From David Hill
| -rw-r--r-- | sys/netinet/in_pcb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 7924049db77..481f9d143ad 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.138 2013/05/31 13:15:53 bluhm Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.139 2013/06/01 13:25:40 bluhm Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -480,7 +480,6 @@ in_pcbdetach(struct inpcb *inp) ip_freemoptions(inp->inp_moptions); #ifdef IPSEC /* IPsec cleanup here */ - s = splsoftnet(); if (inp->inp_tdb_in) TAILQ_REMOVE(&inp->inp_tdb_in->tdb_inp_in, inp, inp_tdb_in_next); @@ -493,7 +492,6 @@ in_pcbdetach(struct inpcb *inp) ipsp_reffree(inp->inp_ipsec_remoteauth); if (inp->inp_ipo) ipsec_delete_policy(inp->inp_ipo); - splx(s); #endif #if NPF > 0 if (inp->inp_pf_sk) |