diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-06-01 13:25:41 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-06-01 13:25:41 +0000 |
| commit | f369e8148c8870e031c347954fb3f912672d4fc7 (patch) | |
| tree | 37d68164de5a698fd6d981abc5258d28ce632ef1 /sys | |
| parent | 7b2d9878fb7c502fab51455a123deeecfc473f44 (diff) | |
Remove redundant call to splsoftnet(). There is a
splsoftassert(IPL_SOFTNET) at the start of in_pcbdetach().
From David Hill
Diffstat (limited to 'sys')
| -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) |