diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2018-04-24 15:40:56 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2018-04-24 15:40:56 +0000 |
| commit | 4fb053a8d5cca51b3ebdf34a236bd5320909952f (patch) | |
| tree | 56a5ae16ddb5725b60694a08fe1e51f58fcda641 /sys/netinet6/raw_ip6.c | |
| parent | 6c06375dd84ae705761d3028fc7ccc6d3e02f786 (diff) | |
Push NET_LOCK down in the default ifioctl case.
For the PRU_CONTROL bit the NET_LOCK surrounds in[6]_control() and
on the ENOTSUPP case we guard the driver if_ioctl functions.
OK mpi@
Diffstat (limited to 'sys/netinet6/raw_ip6.c')
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 464e44090d9..d75031fd090 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.126 2018/02/01 21:11:33 bluhm Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.127 2018/04/24 15:40:55 pirofti Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -547,12 +547,12 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, struct inpcb *in6p = sotoinpcb(so); int error = 0; - soassertlocked(so); - if (req == PRU_CONTROL) return (in6_control(so, (u_long)m, (caddr_t)nam, (struct ifnet *)control)); + soassertlocked(so); + switch (req) { case PRU_DISCONNECT: if ((so->so_state & SS_ISCONNECTED) == 0) { |