diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-20 14:10:01 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-20 14:10:01 +0000 |
| commit | c84e8556077cab8d41773c352e4c8f94f840f366 (patch) | |
| tree | 9b2f487835eff7aa3b20edebc2bfdb3a9ca3df70 /sys | |
| parent | a739b83497b5acb2d437f4be8db4edf6e9cb1a04 (diff) | |
Kill recursive splsoftnet()/splx() in tcp_ctloutput().
ok mikeb@, bluhm@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 4906b4dc326..ed781bafdd7 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.137 2016/12/19 08:36:49 mpi Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.138 2016/12/20 14:10:00 mpi Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -451,16 +451,14 @@ int tcp_ctloutput(int op, struct socket *so, int level, int optname, struct mbuf **mp) { - int error = 0, s; + int error = 0; struct inpcb *inp; struct tcpcb *tp; struct mbuf *m; int i; - s = splsoftnet(); inp = sotoinpcb(so); if (inp == NULL) { - splx(s); if (op == PRCO_SETOPT) (void) m_free(*mp); return (ECONNRESET); @@ -479,7 +477,6 @@ tcp_ctloutput(int op, struct socket *so, int level, int optname, error = EAFNOSUPPORT; /*?*/ break; } - splx(s); return (error); } tp = intotcpcb(inp); @@ -606,7 +603,6 @@ tcp_ctloutput(int op, struct socket *so, int level, int optname, } break; } - splx(s); return (error); } |