diff options
| author | ozaki-r <ozaki-r@NetBSD.org> | 2017-09-27 10:05:04 +0000 |
|---|---|---|
| committer | ozaki-r <ozaki-r@NetBSD.org> | 2017-09-27 10:05:04 +0000 |
| commit | 9ec002730b264aad540a9cedca53e2578486d785 (patch) | |
| tree | b7b85b81b17189ce1adec9079459c490de9912ad /sys/netinet6/ip6_input.c | |
| parent | 0cd953860d6624511a69e27fee0a4e91c1bd509b (diff) | |
Take softnet_lock on pr_input properly if NET_MPSAFE
Currently softnet_lock is taken unnecessarily in some cases, e.g.,
icmp_input and encap4_input from ip_input, or not taken even if needed,
e.g., udp_input and tcp_input from ipsec4_common_input_cb. Fix them.
NFC if NET_MPSAFE is disabled (default).
Diffstat (limited to 'sys/netinet6/ip6_input.c')
| -rw-r--r-- | sys/netinet6/ip6_input.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index ab1b7943512..17a0a88f49e 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.181 2017/07/27 06:59:28 ozaki-r Exp $ */ +/* $NetBSD: ip6_input.c,v 1.182 2017/09/27 10:05:05 ozaki-r Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.181 2017/07/27 06:59:28 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.182 2017/09/27 10:05:05 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_gateway.h" @@ -797,9 +797,7 @@ ip6_input(struct mbuf *m, struct ifnet *rcvif) } #endif /* IPSEC */ - SOFTNET_LOCK(); nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt); - SOFTNET_UNLOCK(); } return; |
