diff options
| author |   mpi <mpi@openbsd.org> | 2017-09-05 07:59:11 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-09-05 07:59:11 +0000 |
| commit | d4480da9aa53ae4286211896db3d62a4dcbdf174 (patch) | |
| tree | ec85ca7589accdfcb038e726b2026fc0e1cc1107 /sys/netinet6 | |
| parent | Remove unused 32bit version of elf_hash(). (diff) | |
| download | wireguard-openbsd-d4480da9aa53ae4286211896db3d62a4dcbdf174.tar.xz wireguard-openbsd-d4480da9aa53ae4286211896db3d62a4dcbdf174.zip | |
Replace NET_ASSERT_LOCKED() by soassertlocked() in *_usrreq().
Not all of them need the NET_LOCK().
ok bluhm@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_divert.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c index 1afdf9a5096..0ab1305684e 100644 --- a/sys/netinet6/ip6_divert.c +++ b/sys/netinet6/ip6_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_divert.c,v 1.49 2017/07/27 12:04:42 mpi Exp $ */ +/* $OpenBSD: ip6_divert.c,v 1.50 2017/09/05 07:59:11 mpi Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -249,7 +249,7 @@ divert6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *addr, struct inpcb *inp = sotoinpcb(so); int error = 0; - NET_ASSERT_LOCKED(); + soassertlocked(so); if (req == PRU_CONTROL) { return (in6_control(so, (u_long)m, (caddr_t)addr, diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 7a536033f66..d9777ba4674 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.118 2017/09/01 15:05:31 mpi Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.119 2017/09/05 07:59:11 mpi Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -570,7 +570,7 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, struct inpcb *in6p = sotoinpcb(so); int error = 0; - NET_ASSERT_LOCKED(); + soassertlocked(so); if (req == PRU_CONTROL) return (in6_control(so, (u_long)m, (caddr_t)nam, |