summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-12-19 11:30:27 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-12-19 11:30:27 +0000
commit3dba059c431ccbc29cadebdcb5f95515c4ad4a7f (patch)
tree0732af7270af46151c86099e84b6109a869bb6c9 /sys/netinet
parent2812680daf42f68ed83886001b117684ad462b0c (diff)
Remove a recursive splsoftnet() in in_ioctl() that already asserts that
it is called at IPL_SOFTNET.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 230bf3355b6..1b2eb9e2e29 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in.c,v 1.131 2016/12/19 10:35:12 bluhm Exp $ */
+/* $OpenBSD: in.c,v 1.132 2016/12/19 11:30:26 mpi Exp $ */
/* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */
/*
@@ -210,7 +210,6 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged)
struct sockaddr_in oldaddr;
int error;
int newifaddr;
- int s;
splsoftassert(IPL_SOFTNET);
@@ -310,18 +309,15 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged)
case SIOCSIFDSTADDR:
if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
return (EINVAL);
- s = splsoftnet();
oldaddr = ia->ia_dstaddr;
ia->ia_dstaddr = *satosin(&ifr->ifr_dstaddr);
if (ifp->if_ioctl && (error = (*ifp->if_ioctl)
(ifp, SIOCSIFDSTADDR, (caddr_t)ia))) {
ia->ia_dstaddr = oldaddr;
- splx(s);
return (error);
}
in_scrubhost(ia, &oldaddr);
in_addhost(ia, &ia->ia_dstaddr);
- splx(s);
break;
case SIOCSIFBRDADDR: