From owner-svn-src-user@FreeBSD.ORG Wed Oct 23 22:49:33 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7BCD4C69; Wed, 23 Oct 2013 22:49:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A2DF26C6; Wed, 23 Oct 2013 22:49:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NMnX8w081991; Wed, 23 Oct 2013 22:49:33 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NMnXW0081990; Wed, 23 Oct 2013 22:49:33 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310232249.r9NMnXW0081990@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 23 Oct 2013 22:49:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257019 - 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: Wed, 23 Oct 2013 22:49:33 -0000 Author: ae Date: Wed Oct 23 22:49:32 2013 New Revision: 257019 URL: http://svnweb.freebsd.org/changeset/base/257019 Log: Remove in6_clearscope() and in6_setscope() calls from nd6_ioctl(). Modified: user/ae/inet6/sys/netinet6/nd6.c Modified: user/ae/inet6/sys/netinet6/nd6.c ============================================================================== --- user/ae/inet6/sys/netinet6/nd6.c Wed Oct 23 21:42:53 2013 (r257018) +++ user/ae/inet6/sys/netinet6/nd6.c Wed Oct 23 22:49:32 2013 (r257019) @@ -1242,8 +1242,6 @@ nd6_ioctl(u_long cmd, caddr_t data, stru if (i >= DRLSTSIZ) break; drl->defrouter[i].rtaddr = dr->rtaddr; - in6_clearscope(&drl->defrouter[i].rtaddr); - drl->defrouter[i].flags = dr->flags; drl->defrouter[i].rtlifetime = dr->rtlifetime; drl->defrouter[i].expire = dr->expire + @@ -1300,10 +1298,8 @@ nd6_ioctl(u_long cmd, caddr_t data, stru j = 0; LIST_FOREACH(pfr, &pr->ndpr_advrtrs, pfr_entry) { if (j < DRLSTSIZ) { -#define RTRADDR oprl->prefix[i].advrtr[j] - RTRADDR = pfr->router->rtaddr; - in6_clearscope(&RTRADDR); -#undef RTRADDR + oprl->prefix[i].advrtr[j] = + pfr->router->rtaddr; } j++; } @@ -1495,13 +1491,9 @@ nd6_ioctl(u_long cmd, caddr_t data, stru case SIOCGNBRINFO_IN6: { struct llentry *ln; - struct in6_addr nb_addr = nbi->addr; /* make local for safety */ - - if ((error = in6_setscope(&nb_addr, ifp, NULL)) != 0) - return (error); IF_AFDATA_RLOCK(ifp); - ln = nd6_lookup(&nb_addr, 0, ifp); + ln = nd6_lookup(&nbi->addr, 0, ifp); IF_AFDATA_RUNLOCK(ifp); if (ln == NULL) {