summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2011-10-13 13:30:41 +0000
committerglebius <glebius@FreeBSD.org>2011-10-13 13:30:41 +0000
commit57408837a2f7de2a34a9d7d93294999f7193c2c6 (patch)
tree07b4a528e4c73e68e5c4dc7e317dc38886734428 /sys/netinet
parent623fcd8af9263433e98341da5cb2c2b551228301 (diff)
downloadFreeBSD-src-57408837a2f7de2a34a9d7d93294999f7193c2c6.zip
FreeBSD-src-57408837a2f7de2a34a9d7d93294999f7193c2c6.tar.gz
De-spl(9).
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 6eae4e5..e1ecf5b 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -845,7 +845,7 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
{
register u_long i = ntohl(sin->sin_addr.s_addr);
struct sockaddr_in oldaddr;
- int s = splimp(), flags = RTF_UP, error = 0;
+ int flags = RTF_UP, error = 0;
oldaddr = ia->ia_addr;
if (oldaddr.sin_family == AF_INET)
@@ -865,7 +865,6 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
if (ifp->if_ioctl != NULL) {
error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia);
if (error) {
- splx(s);
/* LIST_REMOVE(ia, ia_hash) is done in in_control */
ia->ia_addr = oldaddr;
IN_IFADDR_WLOCK();
@@ -884,7 +883,6 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
return (error);
}
}
- splx(s);
if (scrub) {
ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr;
in_ifscrub(ifp, ia, LLE_STATIC);
OpenPOWER on IntegriCloud