Date: Thu, 13 Oct 2011 13:30:41 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226339 - head/sys/netinet Message-ID: <201110131330.p9DDUf3h017512@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Oct 13 13:30:41 2011 New Revision: 226339 URL: http://svn.freebsd.org/changeset/base/226339 Log: De-spl(9). Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Thu Oct 13 13:05:36 2011 (r226338) +++ head/sys/netinet/in.c Thu Oct 13 13:30:41 2011 (r226339) @@ -845,7 +845,7 @@ in_ifinit(struct ifnet *ifp, struct in_i { 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_i 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_i return (error); } } - splx(s); if (scrub) { ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr; in_ifscrub(ifp, ia, LLE_STATIC);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110131330.p9DDUf3h017512>