From owner-svn-src-user@FreeBSD.ORG Fri Jan 18 02:50:10 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CDF55C3C; Fri, 18 Jan 2013 02:50:10 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A81BB770; Fri, 18 Jan 2013 02:50:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0I2oAPA011591; Fri, 18 Jan 2013 02:50:10 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0I2oA6s011590; Fri, 18 Jan 2013 02:50:10 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201301180250.r0I2oA6s011590@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 18 Jan 2013 02:50:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245585 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 02:50:10 -0000 Author: ae Date: Fri Jan 18 02:50:10 2013 New Revision: 245585 URL: http://svnweb.freebsd.org/changeset/base/245585 Log: Remove usage of in6_recoverscope and in6_clearscope functions, they will be not needed, I hope. Modified: user/ae/inet6/sys/netinet6/in6.c Modified: user/ae/inet6/sys/netinet6/in6.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6.c Fri Jan 18 02:36:06 2013 (r245584) +++ user/ae/inet6/sys/netinet6/in6.c Fri Jan 18 02:50:10 2013 (r245585) @@ -538,8 +538,6 @@ in6_control(struct socket *so, u_long cm switch (cmd) { case SIOCGIFADDR_IN6: ifr->ifr_addr = ia->ia_addr; - if ((error = sa6_recoverscope(&ifr->ifr_addr)) != 0) - goto out; break; case SIOCGIFDSTADDR_IN6: @@ -552,8 +550,6 @@ in6_control(struct socket *so, u_long cm * an error? */ ifr->ifr_dstaddr = ia->ia_dstaddr; - if ((error = sa6_recoverscope(&ifr->ifr_dstaddr)) != 0) - goto out; break; case SIOCGIFNETMASK_IN6: @@ -1771,7 +1767,6 @@ in6_lifaddr_ioctl(struct socket *so, u_l * link-local address. */ bcopy(IFA_IN6(ifa), &candidate, sizeof(candidate)); - in6_clearscope(&candidate); candidate.s6_addr32[0] &= mask.s6_addr32[0]; candidate.s6_addr32[1] &= mask.s6_addr32[1]; candidate.s6_addr32[2] &= mask.s6_addr32[2]; @@ -1787,26 +1782,11 @@ in6_lifaddr_ioctl(struct socket *so, u_l ia = ifa2ia6(ifa); if (cmd == SIOCGLIFADDR) { - int error; - /* fill in the if_laddrreq structure */ bcopy(&ia->ia_addr, &iflr->addr, ia->ia_addr.sin6_len); - error = sa6_recoverscope( - (struct sockaddr_in6 *)&iflr->addr); - if (error != 0) { - ifa_free(ifa); - return (error); - } - if ((ifp->if_flags & IFF_POINTOPOINT) != 0) { bcopy(&ia->ia_dstaddr, &iflr->dstaddr, ia->ia_dstaddr.sin6_len); - error = sa6_recoverscope( - (struct sockaddr_in6 *)&iflr->dstaddr); - if (error != 0) { - ifa_free(ifa); - return (error); - } } else bzero(&iflr->dstaddr, sizeof(iflr->dstaddr)); @@ -1815,8 +1795,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l iflr->flags = ia->ia6_flags; /* XXX */ ifa_free(ifa); - - return 0; + return (0); } else { struct in6_aliasreq ifra; @@ -2670,8 +2649,6 @@ in6_lltable_dump(struct lltable *llt, st ndpc.sin6.sin6_family = AF_INET6; ndpc.sin6.sin6_len = sizeof(ndpc.sin6); bcopy(L3_ADDR(lle), &ndpc.sin6, L3_ADDR_LEN(lle)); - if (V_deembed_scopeid) - sa6_recoverscope(&ndpc.sin6); /* publish */ if (lle->la_flags & LLE_PUB)