diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-01-20 04:22:59 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-01-20 04:22:59 +0000 |
| commit | ba458470c63abf95ccfd34ab54e1ccd0d9bdf5f3 (patch) | |
| tree | 29f738da63684bb30bd7a77117f9bdff9b5ee347 /sys/netinet/ipsec_output.c | |
| parent | ef9b227a1e730c393467b99ac51e02bc7a7474dc (diff) | |
Kill recursive splsofnet()/splx() dances.
Tested by Hrvoje Popovski, ok visa@
Diffstat (limited to 'sys/netinet/ipsec_output.c')
| -rw-r--r-- | sys/netinet/ipsec_output.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c index 9ecf51751eb..84b7c53986c 100644 --- a/sys/netinet/ipsec_output.c +++ b/sys/netinet/ipsec_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_output.c,v 1.64 2016/10/11 22:08:01 mikeb Exp $ */ +/* $OpenBSD: ipsec_output.c,v 1.65 2017/01/20 04:22:58 mpi Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -567,9 +567,8 @@ ipsec_adjust_mtu(struct mbuf *m, u_int32_t mtu) struct tdb *tdbp; struct m_tag *mtag; ssize_t adjust; - int s; - s = splsoftnet(); + splsoftassert(IPL_SOFTNET); for (mtag = m_tag_find(m, PACKET_TAG_IPSEC_OUT_DONE, NULL); mtag; mtag = m_tag_find(m, PACKET_TAG_IPSEC_OUT_DONE, mtag)) { @@ -590,6 +589,4 @@ ipsec_adjust_mtu(struct mbuf *m, u_int32_t mtu) ntohl(tdbp->tdb_spi), tdbp->tdb_mtu, adjust, m)); } - - splx(s); } |