From owner-svn-src-user@FreeBSD.ORG  Thu Nov 21 02:45:08 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 ESMTPS id A9CD525B;
 Thu, 21 Nov 2013 02:45:08 +0000 (UTC)
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 9B2462AE3;
 Thu, 21 Nov 2013 02:45:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAL2j8VX084372;
 Thu, 21 Nov 2013 02:45:08 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAL2j88R084371;
 Thu, 21 Nov 2013 02:45:08 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201311210245.rAL2j88R084371@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 21 Nov 2013 02:45:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258414 - 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.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2013 02:45:08 -0000

Author: ae
Date: Thu Nov 21 02:45:07 2013
New Revision: 258414
URL: http://svnweb.freebsd.org/changeset/base/258414

Log:
  Use sa6_checkzone_ifp() function. Since we always know ifp, we can
  use it to initialize sin6_scope_id if user didn't done this.

Modified:
  user/ae/inet6/sys/netinet6/in6.c

Modified: user/ae/inet6/sys/netinet6/in6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6.c	Thu Nov 21 02:42:22 2013	(r258413)
+++ user/ae/inet6/sys/netinet6/in6.c	Thu Nov 21 02:45:07 2013	(r258414)
@@ -433,10 +433,7 @@ in6_control(struct socket *so, u_long cm
 		break;
 	}
 	if (sa6 && sa6->sin6_family == AF_INET6) {
-		if (sa6->sin6_scope_id == 0)
-			sa6->sin6_scope_id = in6_getscopezone(ifp,
-			    in6_addrscope(&sa6->sin6_addr));
-		error = sa6_checkzone(sa6);
+		error = sa6_checkzone_ifp(ifp, sa6);
 		if (error != 0)
 			return (error);
 		if (td != NULL && (error = prison_check_ip6(td->td_ucred,